Przeglądaj źródła

fix(销售订单): 修复订单类型显示和默认进度值问题

liujt 8 miesięcy temu
rodzic
commit
b04ae27230

+ 9 - 6
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -121,17 +121,16 @@
           <el-form-item label="订单类型" prop="needProduce">
             <el-radio
               v-model="form.needProduce"
-              :label="1"
+              :label="0"
               @change="needProduceChange"
-              >有客户生产性订单</el-radio
+              >库存式订单</el-radio
             >
             <el-radio
               v-model="form.needProduce"
-              :label="0"
+              :label="1"
               @change="needProduceChange"
-              >库存式订单</el-radio
+              >有客户生产性订单</el-radio
             >
-
             <el-radio
               v-model="form.needProduce"
               :label="2"
@@ -1312,10 +1311,12 @@
             this.changeParent({ id: this.contactData.id });
           }
           this.form.saleType = 1;
+          this.form.progress = 700;
           //嘉实默认值
           if (this.clientEnvironmentId == 5) {
             this.form.saleType = 2;
             this.form.needProduce = 0;
+            this.form.progress = 700;
             this.form.settlementMode = '6';
           }
           //宝悦默认值
@@ -1332,6 +1333,7 @@
         this.$nextTick(() => {
           this.form.totalAmount = 0;
           this.form.payAmount = 0;
+          this.form.progress = this.form.needProduce == 0 ? 700 : 0;
           this.$refs.inventoryTable &&
             this.$refs.inventoryTable.putTableValue({});
           this.$refs.typeListRef && this.$refs.typeListRef.putTableValue([]);
@@ -1427,7 +1429,8 @@
           let commitData = Object.assign({}, this.form, {
             productList: this.$refs?.inventoryTable?.getTableValue() || [],
             typedetailList: this.$refs?.typeListRef?.getTableValue() || [],
-            saleTypeName: this.getDictValue('销售类型', this.form.saleType)
+            saleTypeName: this.getDictValue('销售类型', this.form.saleType),
+            // progress: this.form.needProduce == 0 ? 700 : 0
           });
           commitData.productList.forEach((item) => {
             if (!item.productCode) {

+ 3 - 3
src/views/saleManage/saleOrder/components/detailDialog.vue

@@ -126,12 +126,12 @@
               prop="needProduce"
               style="margin-bottom: 22px"
             >
-              <el-radio v-model="form.needProduce" :label="1" disabled
-                >有客户生产性订单</el-radio
-              >
               <el-radio v-model="form.needProduce" disabled :label="0"
                 >库存式订单</el-radio
               >
+              <el-radio v-model="form.needProduce" :label="1" disabled
+                >有客户生产性订单</el-radio
+              >
               <el-radio v-model="form.needProduce" disabled :label="2"
                 >无客户生产性订单</el-radio
               >

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/print-template-by.vue

@@ -65,7 +65,7 @@
               项目: {{ formData.projectName }}</td
             >
             <td colspan="3" style="padding: 1px">
-              日期:{{ getNowFormatDate() }}
+              日期:{{ formData.createTime ? formData.createTime.split(' ')[0] : '' }}
             </td>
           </tr>
           <tr>