Преглед изворни кода

Merge branch 'develop_yh39' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh39

chenrui пре 1 година
родитељ
комит
246ca91038

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1714095865513
+  "version": 1714102770513
 }

+ 2 - 0
src/views/salesManagement/salesQuery/edit.vue

@@ -602,6 +602,7 @@ export default {
         // productCode: row.productCode,
         // productOrigCode: row.productOrigCode,
         price: row.price,
+        priceLevel: row.priceLevel,
         qty: row.salesNums,
         salesBillSn: this.detailData.salesBillSn,
         salesBillNo: this.detailData.salesBillNo,
@@ -639,6 +640,7 @@ export default {
           buyerSn: this.detailData.buyerSn,
           productSn: item.productSn,
           cost: item.putCost,
+          priceLevel: item.priceLevel,
           price: item.price,
           qty: item.salesNums,
           salesBillSn: this.detailData.salesBillSn,

+ 2 - 0
src/views/salesManagement/salesQueryNew/edit.vue

@@ -743,6 +743,7 @@ export default {
         // productCode: row.productCode,
         // productOrigCode: row.productOrigCode,
         price: row.price,
+        priceLevel: row.priceLevel,
         qty: row.salesNums,
         salesBillSn: this.detailData.salesBillSn,
         salesBillNo: this.detailData.salesBillNo,
@@ -779,6 +780,7 @@ export default {
           productSn: item.productSn,
           cost: item.putCost,
           price: item.price,
+          priceLevel: item.priceLevel,
           qty: item.salesNums,
           salesBillSn: this.detailData.salesBillSn,
           salesBillNo: this.detailData.salesBillNo,

+ 16 - 10
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -109,7 +109,13 @@
         <a-row :gutter="15">
           <a-col :span="8">
             <a-form-model-item label="是否抓单" prop="grabFlag">
-              <v-select code="FLAG" :disabled="isEdit" id="chooseCustom-grabFlag" v-model="form.grabFlag" allowClear placeholder="请选择"></v-select>
+              <v-select
+                code="FLAG"
+                :disabled="isEdit"
+                id="chooseCustom-grabFlag"
+                v-model="form.grabFlag"
+                allowClear
+                placeholder="请选择"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -119,12 +125,12 @@
         <a-row :gutter="15">
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="{ span: 2 }" :wrapper-col="{ span: 14 }">
-               <a-textarea
-                    v-model="form.remarks"
-                    :maxLength="100"
-                    placeholder="请输入备注(最多100个字符)"
-                    :auto-size="{ minRows: 2, maxRows: 6 }"
-                  />
+              <a-textarea
+                v-model="form.remarks"
+                :maxLength="100"
+                placeholder="请输入备注(最多100个字符)"
+                :auto-size="{ minRows: 2, maxRows: 6 }"
+              />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -204,7 +210,7 @@ export default {
           { required: true, message: '请选择区/县', trigger: 'change' }
         ],
         grabFlag: [
-          { required: true, message: '请选择是否铺货出库', trigger: 'change' }
+          { required: true, message: '请选择是否抓单', trigger: 'change' }
         ]
       },
       addrProvinceList: [], //  省下拉
@@ -264,7 +270,7 @@ export default {
         }
       } else {
         this.$refs.ruleForm.resetFields()
-        if(!this.isEdit){
+        if (!this.isEdit) {
           this.$refs.custList.resetForm()
         }
       }
@@ -277,7 +283,7 @@ export default {
       this.form = Object.assign(this.form, data)
       this.form.buyerName = data.buyerNameCurrent || data.buyerName
       this.buyerSnBak = this.form.buyerSn
-      if(data.buyerInfo){
+      if (data.buyerInfo) {
         this.form.contactTel = data.buyerInfo.contactTel
         this.form.contactMobile = data.buyerInfo.contactMobile
         this.form.consigneeName = data.buyerInfo.contactName

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -494,6 +494,7 @@ export default {
         'price': type == 'edit' ? row.price : row.salePrice,
         'cost': row.putCost,
         'productSn': row.productSn,
+        'priceLevel': row.priceLevel,
         'celQty': row.celQty,
         'hasReturnQty': row.returnQty,
         'qty': row.returnQty,