chenrui 7 bulan lalu
induk
melakukan
6c75ea0b98

+ 8 - 8
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -27,11 +27,11 @@
           </a-radio-group>
           <span v-else>没有可选择的供应商</span>
         </a-form-model-item>
-        <a-form-model-item label="产品类型" prop="tireType">
+        <a-form-model-item label="产品类型" prop="orderType">
           <v-select
             code="ORDER_TYPE"
-            id="purchaseOrder-basicInfo-tireType"
-            v-model="form.tireType"
+            id="purchaseOrder-basicInfo-orderType"
+            v-model="form.orderType"
             allowClear
             placeholder="请选择产品类型"
             :notIn="notShowIn"
@@ -99,13 +99,13 @@ export default {
         settleStyleSn: undefined, //  支付方式
         purchaseTargetSn: undefined, // 供应商
         purchaseTargetName: '', // 供应商名称
-        tireType: undefined // 产品类型
+        orderType: undefined // 产品类型
       },
       rules: {
         purchaseTargetSn: [
           { required: true, message: '请选择供应商', trigger: 'change' }
         ],
-        tireType: [{ required: true, message: '请选择产品类型', trigger: 'change' }],
+        orderType: [{ required: true, message: '请选择产品类型', trigger: 'change' }],
         settleStyleSn: [
           { required: true, message: '请选择支付方式', trigger: 'change' }
         ],
@@ -136,7 +136,7 @@ export default {
       this.form.purchaseTargetType = ''
       this.form.purchaseTargetSn = undefined
       this.form.purchaseTargetName = ''
-      this.form.tireType = undefined
+      this.form.orderType = undefined
     },
     // 供应商change
     tragetTypeChange (e) {
@@ -149,10 +149,10 @@ export default {
       // 经销商向“上级”或“省仓”采购时,默认勾选“非轮胎产品”,不显示轮胎产品
       if (this.form.purchaseTargetType != 'SUPPLIER_SYS') {
         this.notShowIn = ['TIRE']
-        this.form.tireType = 'OTHER'
+        this.form.orderType = 'OTHER'
       } else {
         this.notShowIn = []
-        this.form.tireType = undefined
+        this.form.orderType = undefined
       }
     },
     //  保存

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -206,7 +206,7 @@
                   </a-col>
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
-                      <a-button v-if="!isDealerUp" type="primary" class="button-primary" id="purchaseOrderEdit-cp-importQh-btn" @click="handleOutStock">导入缺货</a-button>
+                      <a-button v-if="!isDealerUp&&detail&&detail.orderType==='OTHER'" type="primary" class="button-primary" id="purchaseOrderEdit-cp-importQh-btn" @click="handleOutStock">导入缺货</a-button>
                       <a-button id="purchaseOrderEdit-cp-importCp-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                   </a-col>

+ 8 - 8
src/views/purchasingManagement/purchaseOrderNew/basicInfoModal.vue

@@ -27,11 +27,11 @@
           </a-radio-group>
           <span v-else>没有可选择的供应商</span>
         </a-form-model-item>
-        <a-form-model-item label="产品类型" prop="tireType">
+        <a-form-model-item label="产品类型" prop="orderType">
           <v-select
             code="ORDER_TYPE"
-            id="purchaseOrder-basicInfo-tireType"
-            v-model="form.tireType"
+            id="purchaseOrder-basicInfo-orderType"
+            v-model="form.orderType"
             allowClear
             placeholder="请选择产品类型"
             :notIn="notShowIn"
@@ -98,13 +98,13 @@ export default {
         settleStyleSn: undefined, //  支付方式
         purchaseTargetSn: undefined, // 供应商sn
         purchaseTargetName: '', // 供应商名称
-        tireType: undefined // 产品类型
+        orderType: undefined // 产品类型
       },
       rules: {
         purchaseTargetSn: [
           { required: true, message: '请选择供应商', trigger: 'change' }
         ],
-        tireType: [{ required: true, message: '请选择产品类型', trigger: 'change' }],
+        orderType: [{ required: true, message: '请选择产品类型', trigger: 'change' }],
         settleStyleSn: [
           { required: true, message: '请选择支付方式', trigger: 'change' }
         ],
@@ -135,7 +135,7 @@ export default {
       this.form.purchaseTargetType = ''
       this.form.purchaseTargetSn = undefined
       this.form.purchaseTargetName = ''
-      this.form.tireType = undefined
+      this.form.orderType = undefined
     },
     // 选择供应商change
     tragetTypeChange (e) {
@@ -148,10 +148,10 @@ export default {
       // 经销商向“上级”或“省仓”采购时,默认勾选“非轮胎产品”,不显示轮胎产品
       if (this.form.purchaseTargetType != 'SUPPLIER_SYS') {
         this.notShowIn = ['TIRE']
-        this.form.tireType = 'OTHER'
+        this.form.orderType = 'OTHER'
       } else {
         this.notShowIn = []
-        this.form.tireType = undefined
+        this.form.orderType = undefined
       }
     },
     //  保存

+ 3 - 2
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -24,7 +24,7 @@
               <a-menu-item key="3" v-if="$hasPermissions('M_shoppingCart')" id="purchaseNewOrderEdit-more-3">
                 <a-icon type="shopping" /> 购物车
               </a-menu-item>
-              <a-menu-item key="2" v-if="!isDealerUp" id="purchaseNewOrderEdit-more-2">
+              <a-menu-item key="2" v-if="!isDealerUp&&detail&&detail.orderType==='OTHER'" id="purchaseNewOrderEdit-more-2">
                 <a-icon type="funnel-plot" />导入缺货
               </a-menu-item>
               <a-menu-item key="1" id="purchaseNewOrderEdit-more-1">
@@ -528,7 +528,8 @@ export default {
     hanldCart () {
       this.paramsData = {
         purchaseBillSn: this.$route.params.sn,
-        purchaseBillNo: this.detail && this.detail.purchaseBillNo ? this.detail.purchaseBillNo : undefined
+        purchaseBillNo: this.detail && this.detail.purchaseBillNo ? this.detail.purchaseBillNo : undefined,
+        orderType: this.detail && this.detail.orderType ? this.detail.orderType : undefined
       }
       this.openShopCatModal = true
     },