Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/BasicSettings/PartSettings/detail.vue

@@ -26,7 +26,7 @@
             />
           </span>
         </Col>
-        <Col span="12">
+        <Col span="12" style="display:flex;align-items: center;">
           <span>工艺属性分类：</span>
           <span>
             <Select
@@ -61,7 +61,7 @@
             </Select>
           </span>
           <span>
-            <Select
+            <!-- <Select
               filterable
               filter-by-label
               multiple
@@ -75,14 +75,14 @@
                 :label="item.title"
                 :value="item.id"
               ></Option>
-            </Select>
-            <!-- <el-select
+            </Select> -->
+            <el-select
               multiple
               collapse-tags
               filterable
               v-model="formData.process_ids"
               @change="changeProvinceSelect"
-              style="width: 200px"
+              style="width: 300px;height:32px"
               @remove-tag="removeProvinceTag"
             >
               <el-option
@@ -99,7 +99,7 @@
                 :value="item.id"
               >
               </el-option>
-            </el-select> -->
+            </el-select>
           </span>
         </Col>
         <Col span="8">
@@ -322,7 +322,7 @@ export default {
         val.length - 1 < this.process_list.length
       ) {
         this.formData.process_ids = this.formData.process_ids.filter((item) => {
-          return item.process_ids !== "全选";
+          return item !== "全选";
         });
       }
     },
@@ -335,7 +335,7 @@ export default {
       if (this.formData.process_ids.length <= this.process_list.length) {
         this.formData.process_ids = [];
         this.process_list.map((item) => {
-          this.formData.process_ids.push(item.process_ids);
+          this.formData.process_ids.push(item.id);
         });
         this.formData.process_ids.unshift("全选");
       } else {
@@ -452,4 +452,8 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+/deep/.el-input__inner {
+  height: 32px;
+}
+</style>

src/views/leadMatch/MatchList/matchList.vue

@@ -8,19 +8,19 @@
       <Col span="6">
         <span>项目编号：</span>
         <span>
-          <Input v-model="SearchInfo.project_number" style="width:140px" size="small"/>
+          <Input clearable v-model="SearchInfo.project_number" style="width:140px" size="small"/>
         </span>
       </Col>
       <Col span="6">
         <span>项目名称：</span>
         <span>
-          <Input v-model="SearchInfo.project_name" style="width:140px" size="small"/>
+          <Input clearable v-model="SearchInfo.project_name" style="width:140px" size="small"/>
         </span>
       </Col>
       <Col span="6">
         <span>项目简称：</span>
         <span>
-          <Input v-model="SearchInfo.project_short_title" style="width:140px" size="small"/>
+          <Input clearable v-model="SearchInfo.project_short_title" style="width:140px" size="small"/>
         </span>
       </Col>
       <Col span="6">
@@ -29,6 +29,7 @@
           <Select
             filterable
             filter-by-label
+            clearable
             transfer
             v-model="SearchInfo.machining_state"
             style="width: 140px"
@@ -168,10 +169,9 @@ export default {
       this.axios({
         method: "get",
         url: "/api/bst_matching_list",
-        params: this.SearchInfo,
+        params: {...this.SearchInfo,page_index:this.page_index,page_size:this.page_size},
       }).then((res) => {
         if (res.code == 200) {
-          console.log("res :>> ", res);
           this.tableData = res.data.data;
           this.total = res.data.total;
         }
@@ -204,11 +204,11 @@ export default {
       }
     },
     changeSize(e) {
-      this.pageSize = e;
+      this.page_size = e;
       this.initData();
     },
     changePage(e) {
-      this.pageIndex = e;
+      this.page_index = e;
       this.initData();
     },
   },

src/views/leadMatch/MatchList/matchPage.vue

@@ -99,7 +99,7 @@
                   >
                     <Row type="flex" align="middle">
                       <Col span="4">
-                        <span>图号：</span><span>{{ url_info.number }}</span>
+                        <span>图号：</span><span>{{ url_info.image_number }}</span>
                       </Col>
                       <Col span="6">
                         <span>产品名称：</span
@@ -262,7 +262,7 @@
                   >
                     <Row type="flex" align="middle">
                       <Col span="4">
-                        <span>图号：</span><span>{{ url_info.number }}</span>
+                        <span>图号：</span><span>{{ url_info.image_number }}</span>
                       </Col>
                       <Col span="8">
                         <span>产品名称：</span
@@ -441,7 +441,11 @@
               </span>
             </Col>
             <Col span="2">
-              <Button @click="back" size="small" type="primary">
+              <Button
+                @click="handleMatchedListInit"
+                size="small"
+                type="primary"
+              >
                 搜索
               </Button>
             </Col>
@@ -556,7 +560,7 @@
                 </span>
               </Col>
               <Col span="2">
-                <Button @click="back" size="small" type="primary">
+                <Button @click="getMatchedDetailList(matched_info)" size="small" type="primary">
                   搜索
                 </Button>
               </Col>
@@ -795,20 +799,25 @@ export default {
       console.log("this.matchedSelectedList :>> ", this.matchedSelectedList);
     },
     handleTabsClick(name) {
-      name == 2 &&
-        this.axios
-          .get("/api/bst_matching_on_product_list", {
-            params: { id: this.info.id },
-          })
-          .then((res) => {
-            res.data.list.map((v) => {
-              v.isCurrenct = false;
-            });
-            this.matchedList = res.data.list;
-            this.urlMatchedList = res.data.image_number;
-            this.productMatchedList = res.data.product_name;
-            console.log(res);
+      name == 2 && this.handleMatchedListInit();
+    },
+    handleMatchedListInit() {
+      this.axios
+        .get("/api/bst_matching_on_product_list", {
+          params: {
+            id: this.info.id,
+            image_number: this.matchedInfo.image_number,
+            product_name: this.matchedInfo.product_name,
+          },
+        })
+        .then((res) => {
+          res.data.list.map((v) => {
+            v.isCurrenct = false;
           });
+          this.matchedList = res.data.list;
+          this.urlMatchedList = res.data.image_number;
+          this.productMatchedList = res.data.product_name;
+        });
     },
     handleShowCurrencySheet(row) {
       if (row.isCurrenct) {

vue.config.js

@@ -2,7 +2,7 @@ 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' //贝斯特