Browse Source

修改bug

chenrui 2 years ago
parent
commit
da53503f7a

+ 6 - 0
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -28,6 +28,12 @@
               </span>
               <span v-else>--</span>
             </a-descriptions-item>
+            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="授权类型">{{ form&&form.menuMouldVal ? form.menuMouldVal : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="财务编码">{{ form&&form.kdMidCustomerFnumber ? form.kdMidCustomerFnumber : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="!isAudit&&form&&form.auditState != 'WAIT'" label="默认仓库">{{ form&&form.warehouseName ? form.warehouseName : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="授权类型">{{ form&&form.menuMouldVal ? form.menuMouldVal : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="财务编码">{{ form&&form.kdMidCustomerFnumber ? form.kdMidCustomerFnumber : '--' }}</a-descriptions-item>
+            <a-descriptions-item v-if="isAudit&&form&&form.auditState == 'WAIT'" label="默认仓库">{{ form&&form.warehouseName ? form.warehouseName : '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
         <a-card title="公司信息" size="small" style="margin-bottom: 15px;">

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

@@ -315,6 +315,7 @@ export default {
       }).then(res => {
         if (res.status == 200) {
           _this.$refs.partQuery.resetCurForm(val)
+          _this.$refs.table.refresh(true)
           _this.spinning = false
         } else {
           _this.spinning = false

+ 4 - 4
src/views/salesReturnManagement/billOfLading/add.vue

@@ -110,7 +110,7 @@
               </a-form-model-item>
             </a-col>
             <a-col :spna="24">
-              <a-form-model-item label="出库仓库" :label-col="{span:2}" :wrapper-col="{span:20}" prop="warehouseSn">
+              <a-form-model-item label="退货仓库" :label-col="{span:2}" :wrapper-col="{span:20}" prop="warehouseSn">
                 <chooseWarehouse ref="warehouse" :disabled="$route.params.sn" v-model="form.warehouseSn" @change="handleWarehouse"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
@@ -233,7 +233,7 @@ export default {
         freight: '', // 运费
         remarks: '',
         attachmentList: '', // 附件
-        warehouseSn: undefined// 出库仓库
+        warehouseSn: undefined// 退货仓库
       },
       attachList: [],
       rules: {
@@ -244,7 +244,7 @@ export default {
           { required: true, message: '请输入主题', trigger: 'blur' }
         ],
         warehouseSn: [
-          { required: true, message: '请选择出库仓库', trigger: 'change' }
+          { required: true, message: '请选择退货仓库', trigger: 'change' }
         ]
       },
       chooseData: [],
@@ -260,7 +260,7 @@ export default {
     }
   },
   methods: {
-    // 选择出库仓库
+    // 选择退货仓库
     handleWarehouse (val) {
       this.form.warehouseSn = val
       if (val) {

+ 1 - 1
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -167,7 +167,7 @@ export default {
     },
     pageInit (buyerSn, warehouseSn) {
       this.buyerSn = buyerSn
-      // this.queryParam.warehouseSn = warehouseSn
+      this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },