Просмотр исходного кода

feat(订单管理): 销售订单单价配置参数是否必填

liujt 8 месяцев назад
Родитель
Сommit
593bf68cbf

+ 5 - 1
src/BIZComponents/inventoryTable.vue

@@ -1897,6 +1897,8 @@
             this.$set(parasm, 'taxRate', item.taxRate);
             this.$set(parasm, 'discountSinglePrice', item.singlePrice);
             this.$set(parasm, 'totalCount', '');
+          } else {
+            this.$set(parasm, 'singlePrice', 0); // 新增物品清单时,单价默认设为0
           }
 
           if (this.isSupplier) {
@@ -1962,7 +1964,7 @@
             this.$set(parasm, 'goodsId', goodsData[0].id);
             this.$set(parasm, 'goodsPriceId', goodsPriceList.id);
             this.$set(parasm, 'goodsPriceType', goodsPriceList.priceType);
-            this.$set(parasm, 'singlePrice', goodsPriceList.unitPrice);
+            this.$set(parasm, 'singlePrice', goodsPriceList.unitPrice || 0);
             this.$set(
               parasm,
               'notaxSinglePrice',
@@ -1971,6 +1973,8 @@
             this.$set(parasm, 'taxRate', goodsPriceList.taxRate);
             this.$set(parasm, 'discountSinglePrice', goodsPriceList.unitPrice);
             this.$set(parasm, 'totalCount', '');
+          } else {
+            this.$set(parasm, 'singlePrice', 0); // 新增物品清单时,单价默认设为0
           }
           if (item.modelKey) {
             this.$set(parasm, 'modelKey', item.modelKey.split(','));

+ 43 - 29
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -20,6 +20,37 @@
       class="el-form-box"
     >
       <headerTitle title="订单信息"> </headerTitle>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="订单类型" prop="needProduce">
+            <el-radio
+              v-model="form.needProduce"
+              :label="1"
+              @change="needProduceChange"
+              >有客户生产性订单</el-radio
+            >
+            <el-radio
+              v-model="form.needProduce"
+              :label="0"
+              @change="needProduceChange"
+              >库存式订单</el-radio
+            >
+            <el-radio
+              v-model="form.needProduce"
+              :label="2"
+              @change="needProduceChange"
+              >无客户生产性订单</el-radio
+            >
+            <el-radio
+              v-model="form.needProduce"
+              :label="4"
+              @change="needProduceChange"
+              v-if="clientEnvironmentId != 5"
+              >不定向订单</el-radio
+            >
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="销售类型" prop="saleType">
@@ -118,33 +149,6 @@
             />
           </el-form-item> -->
 
-          <el-form-item label="订单类型" prop="needProduce">
-            <el-radio
-              v-model="form.needProduce"
-              :label="0"
-              @change="needProduceChange"
-              >库存式订单</el-radio
-            >
-            <el-radio
-              v-model="form.needProduce"
-              :label="1"
-              @change="needProduceChange"
-              >有客户生产性订单</el-radio
-            >
-            <el-radio
-              v-model="form.needProduce"
-              :label="2"
-              @change="needProduceChange"
-              >无客户生产性订单</el-radio
-            >
-            <el-radio
-              v-model="form.needProduce"
-              :label="4"
-              @change="needProduceChange"
-              v-if="clientEnvironmentId != 5"
-              >不定向订单</el-radio
-            >
-          </el-form-item>
           <el-form-item prop="orderFiles" label="订单附件">
             <fileMain v-model="form.orderFiles"></fileMain>
           </el-form-item>
@@ -368,7 +372,7 @@
         :cacheKeyUrl="cacheKeyUrl"
         :isGoods="true"
         :isTaxRate="isTaxRate"
-        :isSinglePrice="form.needProduce != 2"
+        :isSinglePrice="form.needProduce != 2 && isSinglePrice != 0"
         :isBatchNo="isBatchNo == 1 && form.saleTypeName.includes('受托')"
       ></inventoryTable>
       <headerTitle
@@ -720,7 +724,8 @@
         enterprisePage: [],
         businessId: '',
         isBatchNo: 0,
-        isTaxRate: 0
+        isTaxRate: 0,
+        isSinglePrice: 0
       };
     },
     computed: {
@@ -805,11 +810,20 @@
         this.isBatchNo = res.value;
       });
 
+      // 税率是否必填//0否 1是
       parameterGetByCode({
         code: 'eom_saleOrder_order-taxRate'
       }).then((res) => {
         this.isTaxRate = res.value;
       });
+
+      // 单价是否必填//0否 1是
+      parameterGetByCode({
+        code: 'eom_saleOrder_single_price'
+      }).then((res) => {
+        this.isSinglePrice = res.value;
+        console.log('isSinglePrice', this.isSinglePrice)
+      })
     },
     methods: {
       setCountAmount(allPrice) {