hml2020 1 år sedan
förälder
incheckning
b83b41e7c9
2 ändrade filer med 136 tillägg och 50 borttagningar
  1. 65 21
      src/pages/payment/edit.vue
  2. 71 29
      src/pages/procure/edit.vue

+ 65 - 21
src/pages/payment/edit.vue

@@ -4,29 +4,32 @@
       <wd-calendar
         v-model="detail.COL_ALIAS_0.value"
         label="收款日期"
+        required
         @confirm="handleConfirm($event, 1)"
       />
       <wd-picker
         :columns="columns"
+        required
         label="项目名称"
         @confirm="project($event, 1)"
         v-model="detail.COL_ALIAS_7.value"
       />
-      <wd-input type="digit" label="金额" v-model="detail.COL_ALIAS_12.value" />
-      <wd-picker :columns="payList" label="回款方式" v-model="detail.COL_ALIAS_1.value" />
-      <wd-input type="digit" label="贴息费" v-model="detail.COL_ALIAS_7.value" />
-      <wd-input type="digit" label="净额" v-model="detail.COL_ALIAS_14.value" />
-      <wd-input type="digit" label="余额" v-model="detail.COL_ALIAS_15.value" />
-      <wd-input label="汇款单位名称" v-model="detail.COL_ALIAS_4.value" />
-      <wd-input label="汇款单位账号" v-model="detail.COL_ALIAS_5.value" />
+      <wd-input type="digit" label="金额" required v-model="detail.COL_ALIAS_12.value" />
+      <wd-picker :columns="payList" label="回款方式 " required v-model="detail.COL_ALIAS_1.value" />
+      <wd-input type="digit" label="贴息费" required v-model="detail.COL_ALIAS_7.value" />
+      <wd-input type="digit" label="净额" required v-model="detail.COL_ALIAS_14.value" />
+      <wd-input type="digit" label="余额" required v-model="detail.COL_ALIAS_15.value" />
+      <wd-input label="汇款单位名称" required v-model="detail.COL_ALIAS_4.value" />
+      <wd-input label="汇款单位账号" required v-model="detail.COL_ALIAS_5.value" />
       <wd-picker
+        required
         :columns="accounts"
         label="账户名称"
         @confirm="clickAccount($event, 1)"
         v-model="detail.COL_ALIAS_2.value"
       />
-      <wd-input label="收款银行账号" readonly v-model="detail.COL_ALIAS_3.value" />
-      <wd-cell title="汇款类型">
+      <wd-input required label="收款银行账号" readonly v-model="detail.COL_ALIAS_3.value" />
+      <wd-cell required title="汇款类型">
         <template #default>
           <wd-radio-group v-model="detail.COL_ALIAS_8.value" shape="button">
             <wd-radio :value="'打款'">打款</wd-radio>
@@ -34,34 +37,41 @@
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input label="财务姓名" v-model="detail.COL_ALIAS_17.value" />
+      <wd-input required label="财务姓名" v-model="detail.COL_ALIAS_17.value" />
       <view class="btn">
         <wd-button block type="primary" @click="formSubmit">提交</wd-button>
       </view>
     </wd-cell-group>
     <wd-cell-group v-else custom-class="group" border>
-      <wd-calendar v-model="fields[554]" label="收款日期" @confirm="handleConfirm($event, 3)" />
+      <wd-calendar
+        required
+        v-model="fields[554]"
+        label="收款日期"
+        @confirm="handleConfirm($event, 3)"
+      />
       <wd-picker
+        required
         :columns="columns"
         @confirm="project($event, 2)"
         label="项目名称"
         v-model="fields[561]"
       />
-      <wd-input type="digit" label="金额" v-model="fields[566]" />
-      <wd-picker :columns="payList" label="回款方式" v-model="fields[555]" />
-      <wd-input type="digit" label="贴息费" v-model="fields[567]" />
-      <wd-input type="digit" label="净额" v-model="fields[568]" />
-      <wd-input type="digit" label="余额" v-model="fields[569]" />
-      <wd-input label="汇款单位名称" v-model="fields[558]" />
-      <wd-input label="汇款单位账号" v-model="fields[559]" />
+      <wd-input type="digit" required label="金额" v-model="fields[566]" />
+      <wd-picker :columns="payList" required label="回款方式" v-model="fields[555]" />
+      <wd-input type="digit" required label="贴息费" v-model="fields[567]" />
+      <wd-input type="digit" required label="净额" v-model="fields[568]" />
+      <wd-input type="digit" required label="余额" v-model="fields[569]" />
+      <wd-input label="汇款单位名称" required v-model="fields[558]" />
+      <wd-input label="汇款单位账号" required v-model="fields[559]" />
       <wd-picker
+        required
         :columns="accounts"
         label="账户名称"
         @confirm="clickAccount($event, 2)"
         v-model="fields[556]"
       />
-      <wd-input label="收款银行账号" readonly v-model="fields[557]" />
-      <wd-cell title="汇款类型">
+      <wd-input required label="收款银行账号" readonly v-model="fields[557]" />
+      <wd-cell title="汇款类型" required>
         <template #default>
           <wd-radio-group v-model="fields[562]" shape="button">
             <wd-radio :value="'打款'">打款</wd-radio>
@@ -69,7 +79,7 @@
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input label="财务姓名" v-model="fields[665]" />
+      <wd-input required label="财务姓名" v-model="fields[665]" />
       <view class="btn">
         <wd-button block type="primary" @click="formAdd">提交</wd-button>
       </view>
@@ -178,6 +188,23 @@ function projectList() {
 }
 // 新增
 function formAdd() {
+  if (
+    fields.value[554] == '' ||
+    fields.value[561] == '' ||
+    fields.value[566] == '' ||
+    fields.value[555] == '' ||
+    fields.value[567] == '' ||
+    fields.value[568] == '' ||
+    fields.value[569] == '' ||
+    fields.value[558] == '' ||
+    fields.value[559] == '' ||
+    fields.value[556] == '' ||
+    fields.value[562] == '' ||
+    fields.value[665] == ''
+  ) {
+    toast.error('请填写完整信息');
+    return;
+  }
   const date = new Date();
   fields.value[563] = moment(date).valueOf();
   fields.value[564] = moment(date).valueOf();
@@ -214,6 +241,23 @@ function handleConfirm(e, num) {
   }
 }
 function formSubmit() {
+  if (
+    detail.value.COL_ALIAS_0.value == '' ||
+    detail.value.COL_ALIAS_7.value == '' ||
+    detail.value.COL_ALIAS_12.value == '' ||
+    detail.value.COL_ALIAS_1.value == '' ||
+    detail.value.COL_ALIAS_7.value == '' ||
+    detail.value.COL_ALIAS_14.value == '' ||
+    detail.value.COL_ALIAS_15.value == '' ||
+    detail.value.COL_ALIAS_4.value == '' ||
+    detail.value.COL_ALIAS_5.value == '' ||
+    detail.value.COL_ALIAS_2.value == '' ||
+    detail.value.COL_ALIAS_3.value == '' ||
+    detail.value.COL_ALIAS_17.value == ''
+  ) {
+    toast.error('请填写完整信息');
+    return;
+  }
   let dataObj = {};
   detail.value.COL_ALIAS_0.value = moment(detail.value.COL_ALIAS_0.value).valueOf();
   detail.value.COL_ALIAS_10.value = moment(new Date()).valueOf();

+ 71 - 29
src/pages/procure/edit.vue

@@ -1,26 +1,29 @@
 <template>
   <view class="edit">
-    <wd-cell-group v-if="isEdit == '1'" custom-class="group" border :>
-      <wd-input label="采购单名称" v-model="detail.COL_ALIAS_1.value" />
+    <wd-cell-group v-if="isEdit == '1'" custom-class="group" border>
+      <wd-calendar
+        required
+        v-model="detail.COL_ALIAS_0.value"
+        label="付款日期"
+        @confirm="handleConfirm($event, 1)"
+      />
       <wd-input label="采购单号" readonly v-model="detail.COL_ALIAS_23.value" />
-      <wd-input type="digit" label="采购单价(元)" required v-model="detail.COL_ALIAS_14.value" />
-      <wd-input type="digit" label="采购金额(元)" v-model="detail.COL_ALIAS_15.value" />
-      <wd-input label="采购人" v-model="detail.COL_ALIAS_9.value" />
-      <wd-input :label="'采购数量'" required v-model="detail.COL_ALIAS_13.value" />
+      <wd-input label="采购单名称" required v-model="detail.COL_ALIAS_1.value" />
       <wd-picker
         :columns="columns"
         @confirm="projectClick($event, 1)"
         label="项目名称"
         v-model="detail.COL_ALIAS_7.value"
+        required
       />
-      <wd-input label="项目编号" readonly v-model="detail.COL_ALIAS_6.value" />
       <wd-picker
         :columns="oilList"
+        required
         label="油品名称"
         @confirm="oilClick($event, 1)"
         v-model="detail.COL_ALIAS_2.value"
       />
-      <wd-picker :columns="oilInfo" label="型号" v-model="detail.COL_ALIAS_3.value" />
+      <wd-picker :columns="oilInfo" required label="型号" v-model="detail.COL_ALIAS_3.value" />
       <wd-cell title="单位吨或者升" required>
         <template #default>
           <wd-radio-group v-model="detail.COL_ALIAS_22.value" shape="button">
@@ -29,40 +32,53 @@
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input label="市场价" v-model="detail.COL_ALIAS_16.value" />
-      <wd-input label="销售价格" v-model="detail.COL_ALIAS_19.value" />
-      <wd-input label="折吨价" v-model="detail.COL_ALIAS_17.value" />
-      <wd-input label="下浮价" v-model="detail.COL_ALIAS_18.value" />
-      <wd-input label="价差" v-model="detail.COL_ALIAS_20.value" />
+      <wd-input :label="'采购数量'" required v-model="detail.COL_ALIAS_13.value" />
+      <wd-input type="digit" label="采购单价(元)" required v-model="detail.COL_ALIAS_14.value" />
+      <wd-input type="digit" label="采购金额(元)" required v-model="detail.COL_ALIAS_15.value" />
+      <wd-input label="市场价" required v-model="detail.COL_ALIAS_16.value" />
+      <wd-input label="销售价格" required v-model="detail.COL_ALIAS_19.value" />
+      <wd-input label="折吨价" required v-model="detail.COL_ALIAS_17.value" />
+      <wd-input label="下浮价" required v-model="detail.COL_ALIAS_18.value" />
+      <wd-input label="价差" required v-model="detail.COL_ALIAS_20.value" />
       <wd-picker :columns="payList" label="付款名称" v-model="detail.COL_ALIAS_5.value" />
-      <wd-calendar
-        v-model="detail.COL_ALIAS_0.value"
-        label="付款日期"
-        @confirm="handleConfirm($event, 1)"
-      />
       <wd-picker :columns="collectionList" label="收款名称" v-model="detail.COL_ALIAS_4.value" />
+      <wd-input label="项目编号" readonly v-model="detail.COL_ALIAS_6.value" />
+      <wd-input label="采购人" v-model="detail.COL_ALIAS_9.value" />
       <view class="btn">
         <wd-button block type="primary" @click="formSubmit">提交</wd-button>
       </view>
     </wd-cell-group>
     <wd-cell-group v-else custom-class="group" border>
-      <wd-calendar v-model="fields[571]" label="付款日期" @confirm="handleConfirm($event, 2)" />
+      <wd-calendar
+        required
+        v-model="fields[571]"
+        label="付款日期"
+        @confirm="handleConfirm($event, 2)"
+      />
       <wd-input label="采购单号" placeholder="自动生成" readonly v-model="fields[875]" />
-      <wd-input label="采购单名称" v-model="fields[572]" />
+      <wd-input required label="采购单名称" v-model="fields[572]" />
       <wd-picker
         :columns="columns"
         @confirm="projectClick($event, 2)"
         label="项目名称"
         v-model="fields[578]"
+        required
       />
       <wd-picker
         v-if="fields[578] != ''"
         :columns="oilList"
         label="油品名称"
+        required
         @confirm="oilClick($event, 2)"
         v-model="fields[573]"
       />
-      <wd-picker v-if="fields[573] != ''" :columns="oilInfo" label="型号" v-model="fields[574]" />
+      <wd-picker
+        required
+        v-if="fields[573] != ''"
+        :columns="oilInfo"
+        label="型号"
+        v-model="fields[574]"
+      />
       <wd-cell title="单位吨或者升" required>
         <template #default>
           <wd-radio-group v-model="fields[864]" shape="button">
@@ -71,14 +87,14 @@
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input :label="'采购数量:'" v-model="fields[584]" />
+      <wd-input required :label="'采购数量:'" v-model="fields[584]" />
       <wd-input required type="digit" label="采购单价(元)" v-model="fields[585]" />
       <wd-input required type="digit" label="采购金额(元)" v-model="fields[586]" />
-      <wd-input label="市场价" type="digit" v-model="fields[587]" />
-      <wd-input label="折吨价" type="digit" v-model="fields[588]" />
-      <wd-input label="下浮价" type="digit" v-model="fields[589]" />
-      <wd-input label="销售价格" type="digit" v-model="fields[590]" />
-      <wd-input label="价差" type="digit" v-model="fields[591]" />
+      <wd-input required label="市场价" type="digit" v-model="fields[587]" />
+      <wd-input required label="折吨价" type="digit" v-model="fields[588]" />
+      <wd-input required label="下浮价" type="digit" v-model="fields[589]" />
+      <wd-input required label="销售价格" type="digit" v-model="fields[590]" />
+      <wd-input required label="价差" type="digit" v-model="fields[591]" />
       <wd-picker :columns="collectionList" label="收款名称" v-model="fields[575]" />
       <wd-picker :columns="payList" label="付款名称" v-model="fields[576]" />
       <wd-input label="采购人" v-model="fields[580]" />
@@ -172,7 +188,22 @@ function oilClick(e, num) {
 
 // 新增
 function formAdd() {
-  if (fields.value[584] == '' || fields.value[585] == '' || fields.value[864] == '') {
+  if (
+    fields.value[571] == '' ||
+    fields.value[572] == '' ||
+    fields.value[578] == '' ||
+    fields.value[573] == '' ||
+    fields.value[574] == '' ||
+    fields.value[864] == '' ||
+    fields.value[584] == '' ||
+    fields.value[585] == '' ||
+    fields.value[586] == '' ||
+    fields.value[587] == '' ||
+    fields.value[588] == '' ||
+    fields.value[589] == '' ||
+    fields.value[590] == '' ||
+    fields.value[591] == ''
+  ) {
     toast.error('请填写完整信息');
     return;
   }
@@ -280,9 +311,20 @@ function handleConfirm(e, num) {
 }
 function formSubmit() {
   if (
+    detail.value.COL_ALIAS_0.value == '' ||
+    detail.value.COL_ALIAS_1.value == '' ||
+    detail.value.COL_ALIAS_7.value == '' ||
+    detail.value.COL_ALIAS_2.value == '' ||
+    detail.value.COL_ALIAS_3.value == '' ||
+    detail.value.COL_ALIAS_22.value == '' ||
     detail.value.COL_ALIAS_13.value == '' ||
     detail.value.COL_ALIAS_14.value == '' ||
-    detail.value.COL_ALIAS_23.value == ''
+    detail.value.COL_ALIAS_15.value == '' ||
+    detail.value.COL_ALIAS_16.value == '' ||
+    detail.value.COL_ALIAS_17.value == '' ||
+    detail.value.COL_ALIAS_18.value == '' ||
+    detail.value.COL_ALIAS_19.value == '' ||
+    detail.value.COL_ALIAS_20.value == ''
   ) {
     toast.error('请填写完整信息');
     return;