8

src/views/Dispatching/Dispatching.vue

@@ -21,12 +21,12 @@
     <div class="main">
       <Form style='display:flex;margin:15px 0;flex-wrap:wrap' :label-width='100'>
         <FormItem label='订单编号:' >
-          <Select style="width:200px" v-model="searchData.order_no"  filterable @on-change='orderNoChange'>
+          <Select style="width:200px" v-model="searchData.order_no"  filterable @on-change='orderNoChange' clearable>
             <Option :value="item" :label="item" v-for="(item,index) in orderList" :key="index"></Option>
           </Select>
         </FormItem>
         <FormItem label='项目名称:' >
-          <Select style="width:200px" v-model="searchData.residential_name"  filterable @on-change='residentialNameChange'>
+          <Select style="width:200px" v-model="searchData.residential_name"  filterable @on-change='residentialNameChange' clearable>
             <Option :value="item" :label="item" v-for="(item,index) in projectList" :key="index"></Option>
           </Select>
         </FormItem>
@@ -301,8 +301,8 @@ export default {
       })
   },
   methods: {
-   async residentialNameChange(val){
-         await  this.axios.get('/api/order_produce_order_no',{params:{...this.searchData}}).then(res=>{
+  async residentialNameChange(val){
+       await this.axios.get('/api/order_produce_order_no',{params:{residential_name:val}}).then(res=>{
             this.searchData.order_no = res.data.order_no
            })
            if(this.searchData.residential_name&&this.searchData.order_no){
@@ -310,11 +310,13 @@ export default {
               this.axios.get('/api/order_produce_url_number',{params:{...this.searchData}}).then(res=>{
                 this.urlNumberList = res.data
               })
+           }else{
+             this.show = true;
            }
          
     },
-  async orderNoChange(val){
-            await  this.axios.get('/api/order_produce_order_no',{params:{...this.searchData}}).then(res=>{
+ async orderNoChange(val){
+           await this.axios.get('/api/order_produce_order_no',{params:{order_no:val}}).then(res=>{
             this.searchData.residential_name = res.data.residential_name
            })
            if(this.searchData.residential_name&&this.searchData.order_no){
@@ -322,6 +324,8 @@ export default {
               this.axios.get('/api/order_produce_url_number',{params:{...this.searchData}}).then(res=>{
                 this.urlNumberList = res.data
               })
+           }else{
+             this.show =true;
            }
     },
     change_NK(row){

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -233,6 +233,12 @@ export default {
           minWidth: 200,
           key: "measurement",
         },
+        {
+          title: "工艺要求",
+          align: "center",
+          minWidth: 200,
+          key: "rework_require",
+        },
         { title: "单位", align: "center", minWidth: 200, key: "company" },
         {
           title: "芯片编号",

src/views/leadMatch/MatchList/matchCheck.vue

@@ -97,9 +97,12 @@
             </div>
             <span>图号：{{ matched_info.image_number }}</span>
           </Col>
-          <Col span="6">
+          <Col span="3">
             <span>产品名称：{{ matched_info.product_name }}</span>
           </Col>
+          <Col span="3">
+            <span>区域：{{ matched_info.region }}</span>
+          </Col>
           <Col span="2">
             <span>{{
               matched_info.matching_status == 0

src/views/leadMatch/MatchList/matchPage.vue

@@ -125,7 +125,11 @@
                         <span>批量数：</span>
                         <span>{{ url_info.number }}</span>
                       </Col>
-                      <Col span="4" offset="4">
+                       <Col span="2">
+                        <span>区域：</span>
+                        <span>{{ url_info.region }}</span>
+                      </Col>
+                      <Col span="2" offset="4">
                         <span>
                           总计
                           <span style="color:red">{{
@@ -515,9 +519,12 @@
               <Col span="2">
                 <span>图号：{{ matched_info.image_number }}</span>
               </Col>
-              <Col span="6">
+              <Col span="4">
                 <span>产品名称：{{ matched_info.product_name }}</span>
               </Col>
+              <Col span="2">
+                <span>区域:{{ matched_info.region }}</span>
+              </Col>
               <Col span="2" offset="8">
                 <Button
                   @click="handleMatchedSet(matched_info, -1, 5)"
@@ -947,6 +954,7 @@ export default {
         this.unmatchedObj.urlList.map((v) => (v.isCurrenct = false));
         row.isCurrenct = true;
       }
+     
       this.getSheetDetailList(row,type);
     },
     handleHiddenSheetDetail(row) {
@@ -1034,6 +1042,12 @@ export default {
           .then((res) => {
             this.unmatchedObj.part_list = res.data.part_list;
             this.unmatchedRoomList.house_list = res.data.house_list;
+            this.unmatchedRoomList.house_list.forEach(v=>{
+               this.unmatchedObj.part_list[0].key.list.forEach(item=>{
+                    v[item.key]=item.value
+               })
+            })
+            console.log(this.unmatchedRoomList.house_list)
             this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
               res.data.head_word.map((v) => {
                 return { title: v, align: "center", key: v, minWidth: 60 };

src/views/leadMatch/weightMemo/edit.vue

@@ -67,6 +67,7 @@
               <span>图号：{{item.url_number}}</span>
               <span>产品名称：{{item.product_title}}</span>
                 <span>批量数：{{item.number}}</span>
+                <span>区域：{{item.region}}</span>
               <span :style="item.state == 1?'':'color:red;'"
                     v-if="$route.query.type != 3"
                     >{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>

vue.config.js

@@ -2,12 +2,12 @@ const axios_default_ip =
   process.env.NODE_ENV == "dev"
     ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://124.71.176.88:882" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:82";
 //  http://124.71.176.88:882  //江山
-// 'http://121.41.102.225:82' :测试
+// 'http://124.71.176.88:882' :测试
 
 process.env.VUE_APP_BASE_URL = axios_default_ip;
 module.exports = {