Przeglądaj źródła

feat: 优化收付款条件规则静态

liujt 2 tygodni temu
rodzic
commit
a234619aac

+ 63 - 1
src/enum/dict.js

@@ -88,7 +88,8 @@ export default {
   实验规则类型: 'experiment_sheet',
   实验模板样式: 'experiment_template_style',
   表计类型: 'meter_type',
-  印章类型: 'main_seal_type'
+  印章类型: 'main_seal_type',
+  支付类型: 'payment_type',
 };
 
 export const numberList = [
@@ -249,6 +250,67 @@ export const produceTypeList = [
   }
 ];
 
+// 付款日计算日期
+export const calcPayDateTypeOp = [
+  {
+    label: '订单日期',
+    value: 1
+  },
+  {
+    label: '入库日期',
+    value: 2
+  },
+  {
+    label: '收票日期',
+    value: 3
+  },
+  {
+    label: '对账单日期',
+    value: 4
+  },
+  {
+    label: '应付单日期',
+    value: 5
+  }
+];
+
+// 收款日计算日期
+export const calcReceiveDateTypeOp = [
+  {
+    label: '订单日期',
+    value: 1
+  },
+  {
+    label: '出库日期',
+    value: 2
+  },
+  {
+    label: '应收单日期',
+    value: 3
+  },
+  {
+    label: '开票日期',
+    value: 4
+  },
+  {
+    label: '对账单日期',
+    value: 5
+  }
+]
+
+// 收/付款日确定方式         
+export const payConfirmTypeOp = [
+  {
+    label: '交易日',
+    value: 1
+  },
+  {
+    label: 'X天后',
+    value: 2
+  }
+]
+
+
 //持证类型
 export const holderTypeOptions = [
   {

+ 9 - 18
src/views/rulesManagement/paymentTerms/components/addDialog.vue

@@ -42,11 +42,7 @@
           style="width: 100%"
           :disabled="isDetail"
         >
-          <el-option label="订单日期" :value="1" />
-          <el-option label="入库日期" :value="2" />
-          <el-option label="收票日期" :value="3" />
-          <el-option label="对账单日期" :value="4" />
-          <el-option label="应付单日期" :value="5" />
+          <el-option v-for="item in calcPayDateTypeOp" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -59,8 +55,7 @@
           :disabled="isDetail"
           @change="handleConfirmTypeChange"
         >
-          <el-option label="交易日" :value="1" />
-          <el-option label="X天后" :value="2" />
+          <el-option v-for="item in payConfirmTypeOp" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -118,20 +113,13 @@
             :disabled="isDetail"
           />
           <span class="payment-unit">月</span>
-          <el-select
+          <DictSelection
             v-model="item.type"
+            dictName="支付类型"
             placeholder="请选择"
             class="payment-select"
             :disabled="isDetail"
-          >
-            <el-option label="现金" value="现金" />
-            <el-option label="电汇" value="电汇" />
-            <el-option label="银票" value="银票" />
-            <el-option label="商票" value="商票" />
-            <el-option label="三一金票" value="三一金票" />
-            <el-option label="信用证" value="信用证" />
-            <el-option label="银行承兑汇票" value="银行承兑汇票" />
-          </el-select>
+          />
           <el-button
             v-if="!isDetail && form.paymentList.length > 1 && index !== 0"
             type="text"
@@ -177,6 +165,7 @@
 
 <script>
   import { addPaymentTerms, updatePaymentTerms } from '@/api/rulesManagement/paymentTerms';
+  import { calcPayDateTypeOp, payConfirmTypeOp } from '@/enum/dict';
 
   let paymentId = 0;
 
@@ -187,6 +176,8 @@
         loading: false,
         isUpdate: false,
         isDetail: false,
+        calcPayDateTypeOp,
+        payConfirmTypeOp,
         form: {
           id: null,
           code: '',
@@ -374,7 +365,7 @@
     font-size: 14px;
   }
   .payment-select {
-    width: 120px;
+    width: 120px!important;
   }
   .add-payment-btn,
   .remove-payment-btn {

+ 9 - 18
src/views/rulesManagement/receiveTerms/components/addDialog.vue

@@ -42,11 +42,7 @@
           style="width: 100%"
           :disabled="isDetail"
         >
-          <el-option label="订单日期" :value="1" />
-          <el-option label="出库日期" :value="2" />
-          <el-option label="应收单日期" :value="3" />
-          <el-option label="开票日期" :value="4" />
-          <el-option label="对账单日期" :value="5" />
+          <el-option v-for="item in calcReceiveDateTypeOp" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -59,8 +55,7 @@
           :disabled="isDetail"
           @change="handleConfirmTypeChange"
         >
-          <el-option label="交易日" :value="1" />
-          <el-option label="X天后" :value="2" />
+          <el-option v-for="item in payConfirmTypeOp" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
@@ -118,20 +113,13 @@
             :disabled="isDetail"
           />
           <span class="payment-unit">月</span>
-          <el-select
+          <DictSelection
             v-model="item.type"
+            dictName="支付类型"
             placeholder="请选择"
             class="payment-select"
             :disabled="isDetail"
-          >
-            <el-option label="现金" value="现金" />
-            <el-option label="电汇" value="电汇" />
-            <el-option label="银票" value="银票" />
-            <el-option label="商票" value="商票" />
-            <el-option label="三一金票" value="三一金票" />
-            <el-option label="信用证" value="信用证" />
-            <el-option label="银行承兑汇票" value="银行承兑汇票" />
-          </el-select>
+          />
           <el-button
             v-if="!isDetail && index === form.paymentList.length - 1"
             type="text"
@@ -177,6 +165,7 @@
 
 <script>
   import { addReceiveTerms, updateReceiveTerms } from '@/api/rulesManagement/receiveTerms';
+  import { calcReceiveDateTypeOp, payConfirmTypeOp } from '@/enum/dict';
 
   let paymentId = 0;
 
@@ -187,6 +176,8 @@
         loading: false,
         isUpdate: false,
         isDetail: false,
+        calcReceiveDateTypeOp,
+        payConfirmTypeOp,
         form: {
           id: null,
           code: '',
@@ -374,7 +365,7 @@
     font-size: 14px;
   }
   .payment-select {
-    width: 120px;
+    width: 120px!important;
   }
   .add-payment-btn,
   .remove-payment-btn {