Explorar el Código

fix:竞价客户名称复现、购买方客户名称、招标工作台字段展示

snow hace 1 año
padre
commit
0ba472ff99

+ 2 - 0
src/apis/service/sellOut/zixunOrder/index.js

@@ -16,6 +16,8 @@ export default {
   // 分页查询项目列表
   plist: (data, params) => http(api + 'projectlist', data, 'post', params),
 
+  infolist: (data, params) => http(api + 'infolist', data, 'post', params),
+
   // 删除
   delete: (data, params) => http(api + 'delete', data, 'post', params),
   // 分页查询

+ 8 - 5
src/components/globalComponents/search-customer/main.vue

@@ -53,12 +53,15 @@ export default {
     }
   },
   watch: {
-    names: function(val, old) {
+    names: {
+      handler: function(val, old) {
       // console.log(val, old);
-      this.searchName = val
-      if (this.isDetail && this.searchName) {
-        this.remoteMethod(this.searchName)
-      }
+        this.searchName = val
+        if (this.isDetail && (Array.isArray(this.searchName) && this.searchName[0]) || (!Array.isArray(this.searchName) && this.searchName)) {
+          this.remoteMethod(Array.isArray(this.searchName) ? this.searchName[0] : this.searchName)
+        }
+      },
+      immediate: true
     }
   },
   mounted() {

+ 23 - 16
src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -81,6 +81,23 @@
           />
         </el-form-item>
       </el-col>
+      
+      <el-col :span="24">
+        <el-form-item label="收货区域" prop="area">
+            <search-area
+              :value="areaCode"
+              :disabled="isDetail == '007' || !ruleForm.customer_name"
+              :size="'mini'"
+              :is-detail="true"
+              :detail-select="true"
+              :level="2"
+              :names="areaLabel"
+              :placeholder="'收货区域'"
+              @searchChange="areasearchChange"
+            />
+        </el-form-item>
+      </el-col>
+
       <el-col :span="24" v-if="ruleForm.is_project === '1'">
         <el-form-item label="项目信息" prop="projectNo" class="clear">
           <show-data-table
@@ -155,22 +172,6 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="24">
-        <el-form-item label="收货区域" prop="area">
-            <search-area
-              :value="areaCode"
-              :disabled="isDetail == '007' || !ruleForm.customer_name"
-              :size="'mini'"
-              :is-detail="true"
-              :detail-select="true"
-              :level="2"
-              :names="areaLabel"
-              :placeholder="'收货区域'"
-              @searchChange="areasearchChange"
-            />
-        </el-form-item>
-      </el-col>
-
       <el-col :span="24">
         <el-form-item label="竞价商品要求" class="clear" required>
           <el-table :data="tableData" stripe border :size="'mini'" style="width: 100%">
@@ -709,6 +710,7 @@ export default {
           const { code, data, message } = await asyncRequest.pdetail({
             projectNo: key,
           });
+
           if (code === 0) {
             const {
               khNo,
@@ -721,6 +723,9 @@ export default {
               companyNo,
               company,
             } = data;
+
+            const {data:_data} = await asyncRequest.infolist({companyNo:khNo})
+
             this.ruleForm.projectNo = key;
             this.projectSitem = JSON.parse(JSON.stringify(data));
 
@@ -747,7 +752,9 @@ export default {
               id: khNo,
               code: khNo,
               label: khName,
+              area:_data.item[0].area
             });
+            
             this.ptableData = ladder;
             this.ptableData.forEach((e) => {
               e.cat_name = "";

+ 2 - 2
src/views/sellOut/zixunOrder/components/editForm.vue

@@ -102,7 +102,7 @@
             <search-area
               :value="areaCode"
               :is-detail="type === 'view' || type === 'edit' || type === 'copy-edit'"
-              :disabled="type === 'view' || type === 'edit'"
+              :disabled="type === 'view'"
               :size="'mini'"
               :detail-select="true"
               :level="2"
@@ -1271,7 +1271,7 @@ export default {
       const { id, code, label, area } = e;
       this.ruleForm.khNo = code ? [code] : [];
       this.ruleForm.customer_name = label ? label : "";
-      this.areaLabel = area && area !== '不限区域' ? [area] : []
+      // this.areaLabel = area && area !== '不限区域' ? [area] : []
       this.$refs.ruleForm.validateField("khNo");
     },
     //贵金属种类选择

+ 0 - 1
src/views/sellOut/zixunOrder/index.vue

@@ -212,7 +212,6 @@
           placement="top"
           v-if="
             powers.some((i) => i == '005') &&
-            String(scope.row.status) === '0' &&
             !isSupertube
           "
         >

+ 1 - 1
src/views/supplierPurchaseIn/supplierWorkbench/detail.vue

@@ -48,7 +48,7 @@
                   <p>{{ sitem.company }}</p>
                 </li>
                 <li>
-                  <p>客户收货地址:</p>
+                  <p>收货区域:</p>
                   <p>{{ sitem.area }}</p>
                 </li>
                 <li>