Sfoglia il codice sorgente

feat(采购合同): 添加采购收货模式选项并优化发货模式显示逻辑

liujt 5 mesi fa
parent
commit
e71bc06996

+ 11 - 0
src/enum/dict.js

@@ -282,6 +282,17 @@ export const shippingModeOp = [
   }
 ];
 
+export const shippingModePurchaseOp = [
+  {
+    value: 1,
+    label: '收货再对账'
+  },
+  {
+    value: 2,
+    label: '对账再收货'
+  }
+];
+
 export const quoteTypeOp = [
   {
     value: 1,

+ 8 - 4
src/views/contractManage/contractBook/components/addDialogNew.vue

@@ -319,7 +319,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="发货模式" prop="deliveryMode">
+          <el-form-item :label="form.type == 2 ? '收货模式' : '发货模式'" prop="deliveryMode">
             <el-select
               v-model="form.deliveryMode"
               placeholder="请选择"
@@ -327,7 +327,7 @@
               style="width: 100%"
             >
               <el-option
-                v-for="item in shippingModeOp"
+                v-for="item in shippingModeOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -821,7 +821,7 @@
   import saleOrderListDialog from '@/views/saleManage/saleOrder/invoice/components/orderListDialog.vue'; //销售订单
   import { getSaleOrderDetail } from '@/api/saleManage/saleorder';
   import PaymentCollectionPlan from '@/BIZComponents/paymentCollectionPlan/Index.vue'
-  import { shippingModeOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { shippingModeOp, shippingModePurchaseOp, transactionMethodsOp } from '@/enum/dict.js';
 
   export default {
     props: {
@@ -1042,6 +1042,9 @@
       };
     },
     computed: {
+      shippingModeOptions() {
+        return this.form.type == 2 ? shippingModePurchaseOp : shippingModeOp;
+      },
       rules() {
         let isRequired = this.isRequired;
         return {
@@ -1339,6 +1342,7 @@
 
       //选择合同类型
       dictChange(val, type) {
+        console.log('val~~~', val);
         this.categoryList = copyObj(
           this.contractBookTypeList?.find((item) => item.code == val)?.children
         );
@@ -1633,7 +1637,7 @@
         this.create = create;
         this.source = source;
         this.contractBookTypeList = copyObj(this.categoryTreeList[0].children);
-
+        console.log('contractBookTypeList!!!', this.contractBookTypeList)
         if (type == 'add') {
           let userInfo = this.$store.getters.user.info;
           this.isUpdate = false;

+ 8 - 3
src/views/contractManage/contractBook/components/detailDialog.vue

@@ -165,7 +165,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="发货模式" prop="deliveryMode">
+            <el-form-item :label="form.type == 2 ? '收货模式' : '发货模式'" prop="deliveryMode">
               <el-select
                 v-model="form.deliveryMode"
                 placeholder="请选择"
@@ -173,7 +173,7 @@
                 style="width: 100%"
               >
                 <el-option
-                  v-for="item in shippingModeOp"
+                  v-for="item in shippingModeOptions"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -385,7 +385,7 @@
   import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
   import changeList from './changeList.vue';
   import paymentList from './paymentList.vue';
-  import { shippingModeOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { shippingModeOp, transactionMethodsOp, shippingModePurchaseOp } from '@/enum/dict.js';
   import PaymentCollectionPlan from '@/BIZComponents/paymentCollectionPlan/Index.vue'
 
   export default {
@@ -457,6 +457,11 @@
         transactionMethodsOp
       };
     },
+    computed: {
+      shippingModeOptions() {
+        return this.form.type == 2 ? shippingModePurchaseOp : shippingModeOp;
+      },
+    },
     methods: {
       //导出
       async exportTable() {

+ 3 - 3
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -270,7 +270,7 @@
               style="width: 100%"
             >
               <el-option
-                v-for="item in shippingModeOp"
+                v-for="item in shippingModeOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -749,7 +749,7 @@
   import returnOrderDealDialog from './returnOrderDealDialog.vue';
   import purchaseReturnOrderDialog from '@/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue';
   import PaymentCollectionPlan from '@/BIZComponents/paymentCollectionPlan/Index.vue'
-  import { shippingModeOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { shippingModeOptions, transactionMethodsOp } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins],
@@ -890,7 +890,7 @@
         isUpdate: false,
         businessId: '',
         winnerSuppleIds: '',
-        shippingModeOp,
+        shippingModeOptions,
         transactionMethodsOp,
       };
     },