瀏覽代碼

重新提交

17767204043 3 年之前
父節點
當前提交
e42ad85e99

+ 54 - 0
src/routerMap/index.js

@@ -2197,6 +2197,60 @@ const routerMap = [
     component: (resolve) =>
       require(["@/views/PayrollRequisition/detail"], resolve),
   },
+  {
+    path: "/cms/Agreement/productMessage/list",
+    name: "productMessageList", //生产通知单
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/productMessage/list"], resolve),
+  },
+  {
+    path: "/cms/Agreement/productMessage/confirm",
+    name: "productMessageConfirm", //生产通知单-->查看
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/productMessage/confirm"], resolve),
+  },
+  {
+    path: "/cms/Agreement/productMessage/detail",
+    name: "productMessageDetail", //生产通知单-->查看-->查看
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/productMessage/detail"], resolve),
+  },
+  {
+    path: "/cms/Agreement/match/list",
+    name: "MatchList", //合同-->匹配-->匹配列表
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/match/list"], resolve),
+  },
+  {
+    path: "/cms/Agreement/match/matching",
+    name: "Matching", //合同-->匹配-->匹配操作
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/match/matching"], resolve),
+  },
+  {
+    path: "/cms/Agreement/match/check",
+    name: "MatchCheck", //合同-->匹配-->查看
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Agreement/match/check"], resolve),
+  },
   // 测试用
   {
     path: "/cms/ordermannage/businessorderlist/editcopy",

+ 153 - 0
src/untils/until.js

@@ -5,6 +5,20 @@ export default {
         var result = regexp.exec(Object.prototype.toString.call(obj))[1];
         return result;
     },
+    //深拷贝公共方法
+   deep(dest,obj){ //dest表示 对象 ; obj传入的值
+      var date = dest;//定义的变量
+      for(var key in obj){  //拿到键的值  key
+          if(typeof obj[key] === 'object'){  //类型检测
+              // constructor (属性检测)判断类型是数组还是对象
+              date[key] = (obj[key].constructor === Array) ? [] : {};
+              this.deep(date[key], obj[key]);
+          }else{ //如果obj[key] 不是对象类型,直接复制
+              date[key] = obj[key]
+          }
+      }
+      return date;
+  },
     dateFormat(time) {
         const t = new Date(time * 1000);
         // 日期格式
@@ -962,5 +976,144 @@ export default {
           sub_data.printparams = JSON.stringify(sub_data.printparams);
          return sub_data
         }
+        if(sub_type==5){
+          let data = {};
+          // let url = "http://192.168.0.145:888/postek/print"; //request_url
+         //request_url
+          data.reqParam = "1"; //这个一般不用改,如需改,查api
+          let printparamsJsonArray = [];
+          // let IP = "192.168.1.58";//print_url
+          // let IP = "192.168.0.199"; //print_url
+          // printparamsJsonArray.push({printPort:"1",printName:"POSTEK TX3r"});
+          printparamsJsonArray.push({ PTK_OpenUSBPort:printerUsbPort});
+          printparamsJsonArray.push({ PTK_ClearBuffer: "" });
+          printparamsJsonArray.push({ PTK_SetDirection: "B" });
+          printparamsJsonArray.push({ PTK_SetPrintSpeed: "4" });
+          printparamsJsonArray.push({ PTK_SetDarkness: "10" });
+          printparamsJsonArray.push({
+            PTK_SetLabelHeight: 624 + "," + 24 + ",0,false",
+          });
+          printparamsJsonArray.push({ PTK_SetLabelWidth: 1080 });
+          contents.map((content) => {
+            //贝斯特打印格式
+            //上
+            const printContent_l1 = `项目:${content.client_name}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,40,60,0,微软雅黑,1,700,0,0,0," + printContent_l1,
+            });
+            const printContent_l1_2 = `区域:${
+              content.house ? content.house + "-" : ""
+            }${content.layer ? content.layer : ""}${
+              content.position ? content.position : ""
+            }`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,40,60,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,
+            });
+            const printContent_l2 = `房号:${content.number_detail}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,110,60,0,微软雅黑,1,700,0,0,0," + printContent_l2,
+            });
+            const printContent_l2_2 = `产品:${content.product_title}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,110,60,0,微软雅黑,1,700,0,0,0," + printContent_l2_2,
+            });
+            const printContent_l3 = `图号:${content.url_number}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,180,60,0,微软雅黑,1,700,0,0,0," + printContent_l3,
+            });
+            const printContent_l3_2 = `部件:${content.part_title}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,180,60,0,微软雅黑,1,700,0,0,0," + printContent_l3_2,
+            });
+            const printContent_l4 = `木皮:${content.color_title}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,320,60,0,微软雅黑,1,700,0,0,0," + printContent_l4,
+            });
+            const printContent_l4_2 = `尺寸:${content.measure}`;
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,250,60,0,微软雅黑,1,700,0,0,0," + printContent_l4_2,
+            });
+            let space_str = '\u0000'
+             let printContent_l5_data= (function() {
+              let hexCharCodeStr = content.chip;
+              let trimedStr = hexCharCodeStr.trim();
+              let rawStr = trimedStr.substr(0,2).toLowerCase() === "0x"?trimedStr.substr(2):trimedStr;
+              let len = rawStr.length;
+               if(len % 2 !== 0) {
+                 alert("Illegal Format ASCII Code!");
+                 return "";}
+                let curCharCode;
+                let resultStr = [];
+                for(var i = 0; i < len;i = i + 2) {
+                 curCharCode = parseInt(rawStr.substr(i, 2), 16); // ASCII Code Value
+                   resultStr.push(String.fromCharCode(curCharCode));
+                }
+                return resultStr.join("");
+         })();
+             printContent_l5_data = printContent_l5_data.replace(space_str,'')
+             const printContent_l5 = `芯片编码:${printContent_l5_data}`;
+            //  console.log(printContent_l5_data)
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueTypeEx:
+                "900,330,25,0,微软雅黑,1,700,0,0,0,10,0,0,0," + printContent_l5,
+            });
+            //下
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,435,45,0,微软雅黑,1,700,0,0,0," + printContent_l1,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,435,45,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,480,45,0,微软雅黑,1,700,0,0,0," + printContent_l2,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,480,45,0,微软雅黑,1,700,0,0,0," + printContent_l2_2,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,525,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,525,45,0,微软雅黑,1,700,0,0,0," + printContent_l3_2,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "80,570,45,0,微软雅黑,1,700,0,0,0," + printContent_l4,
+            });
+            printparamsJsonArray.push({
+              PTK_DrawText_TrueType:
+                "580,570,45,0,微软雅黑,1,700,0,0,0," + printContent_l4_2,
+            });
+              printparamsJsonArray.push({
+              PTK_DrawText_TrueTypeEx:
+                "900,530,25,0,微软雅黑,1,700,0,0,0,10,0,0,0," + printContent_l5,
+            });
+            // 17,35 420
+            printparamsJsonArray.push({
+              PTK_RWRFIDLabel:
+                "1,0,0," + content.chip.length / 2 + ",1," + content.chip,
+            });
+            printparamsJsonArray.push({ PTK_PrintLabel: "1,1" });
+          });
+          printparamsJsonArray.push({ PTK_CloseUSBPort: "" });
+          data.printparams = printparamsJsonArray;
+          let sub_data = JSON.parse(JSON.stringify(data));
+          sub_data.printparams = JSON.stringify(sub_data.printparams);
+         return sub_data
+        }
       },
 };

+ 9 - 3
src/views/Agreement/deepen/edit.vue

@@ -40,17 +40,17 @@
             </Form>
             <Form :label-width='100' class="form_content" v-if="$route.query.type==3">
                 <FormItem label='区域:'>
-                    <Select multiple filterable v-model="searchData.region" class="form_item" max-tag-count='2'>
+                    <Select multiple filterable v-model="searchData.region" class="form_item" :max-tag-count='2'>
                         <Option v-for="(item,index) in regionList" :key="index" :value="item" :label='item'></Option>
                     </Select>
                 </FormItem>
                 <FormItem label='图号:'>
-                  <Select multiple filterable v-model="searchData.url_number" class="form_item" max-tag-count='2'>
+                  <Select multiple filterable v-model="searchData.url_number" class="form_item" :max-tag-count='2'>
                         <Option v-for="(item,index) in urlNumberList" :key="index" :value="item" :label='item'></Option>
                     </Select>
                 </FormItem>
                 <FormItem label='产品名称:'>
-                  <Select multiple filterable v-model="searchData.product_title" class="form_item" max-tag-count='2'>
+                  <Select multiple filterable v-model="searchData.product_title" class="form_item" :max-tag-count='2'>
                        <Option v-for="(item,index) in productTitleList" :key="index" :value="item" :label='item'></Option>
                     </Select>
                 </FormItem>
@@ -102,6 +102,9 @@ export default {
                 {title:'图号',align:'center',key:'url_number',minWidth:120},
                 {title:'产品名称',align:'center',key:'product_title',minWidth:120},
                 {title:'数量',align:'center',key:'num',minWidth:120},
+                {title:'单位',align:'center',key:'unit',minWidth:120},
+                {title:'饰面',align:'center',key:'finish',minWidth:120},
+                {title:'备注',align:'center',key:'remark',minWidth:120},
                 {title:'制单日期',align:'center',key:'crt_time',minWidth:120,render:(h,params)=>{
                     const {row} = params;
                     return h('span',{},this.func.replaceDateNoHMS(row.crt_time))
@@ -114,6 +117,9 @@ export default {
                 {title:'图号',align:'center',key:'url_number',minWidth:120},
                 {title:'产品名称',align:'center',key:'product_title',minWidth:120},
                 {title:'数量',align:'center',key:'num',minWidth:120},
+                {title:'单位',align:'center',key:'unit',minWidth:120},
+                {title:'饰面',align:'center',key:'finish',minWidth:120},
+                 {title:'备注',align:'center',key:'remark',minWidth:120},
                 {title:'制单日期',align:'center',key:'crt_time',minWidth:120,render:(h,params)=>{
                     const {row} = params;
                     return h('span',{},this.func.replaceDateNoHMS(row.crt_time))

+ 23 - 9
src/views/Agreement/edit.vue

@@ -152,8 +152,9 @@
              :action="$store.state.ip+'/api/upload_image'">
                <a @click="updTableImg(index)">上传</a>
              </Upload>
-             <div v-show="row.product_img" class="img_box">
-              <img @click="looks(row.product_img,true)" :src="$store.state.ip + row.product_img" alt="" class="img_table_content"/>
+             <div v-if="tableData[index].product_img" class="img_box">
+              <img @click="looks(row.product_img,true)" :src="$store.state.ip + tableData[index].product_img" alt="" class="img_table_content"/>
+              
               <Icon
               v-if="$route.query.type!=4"
               size="20"
@@ -229,7 +230,7 @@ export default {
                 {title:'区域',minWidth:100,align:'center',key:'region'},
                 {title:'产品分类',minWidth:100,align:'center',key:'bp_id'},
                 {title:'产品名称',minWidth:100,align:'center',key:'product_title'},
-                {title:'产品图片',minWidth:100,align:'center',key:'product_img'},
+                {title:'产品图片',minWidth:100,align:'center',key:'product_img',slot:'product_img'},
                 {title:'产品特征',minWidth:100,align:'center',key:'product_feature'},
                 {title:'计量单位',minWidth:100,align:'center',key:'unit'},
                 {title:'工程量',minWidth:100,align:'center',key:'num'},
@@ -390,8 +391,15 @@ export default {
               }
         },
         handleTableSuccess(res,file){
+            // console.log(this.tableData)
              if(res.code==200){
-             this.tableData[this.tableIndex].product_img = res.data.url;
+                 this.tableData[this.tableIndex].product_img = res.data.url;
+                // let obj = this.tableData[this.initData];
+                // obj.product_img = res.data.url;
+                //  this.$set(this.tableData,this.initData,obj)
+                // this.tableData.splice(this.tableIndex,1,obj)
+                //  console.log(this.tableData)
+              
              }
         },
         updTableImg(index){
@@ -470,26 +478,32 @@ export default {
          uploadSuccess(res) {
       if (res.code == 200) {
         this.$Message.success(res.msg || "上传成功");
+        res.data.forEach(v=>{
+            v.product_img='';
+        })
         if(this.tableData.length==0){
-            this.tableData = res.data;
+           
+                // this.tableData = JSON.parse(JSON.stringify(res.data))
+                this.tableData = Object.assign(res.data,this.tableData)
+              this.$forceUpdate();
         }else{
-           let data = JSON.parse(JSON.stringify(this.tableData));
+        //    let data = JSON.parse(JSON.stringify(this.tableData));
            res.data.forEach(v => {
                let arr = [];
                arr = this.tableData.filter(x=>{
                    return x.region == v.region&&x.product_title == v.product_title
                })
                   if(arr.length==0){
-                      data.push(v);
+                      this.tableData.push(v);
                   }else{
                     this.tableData.forEach((ele,index)=>{
                         if(ele.region == v.region&&ele.product_title == v.product_title){
-                                data.splice(index,1,v)
+                                this.tableData.splice(index,1,v)
                         }
                     })
                   }
            });
-            this.tableData = data;
+            // this.tableData = JSON.parse(JSON.stringify(data));
         }
         
       } else {

+ 2 - 0
src/views/BasicSettings/SuppliersManage/SippliersClassify.vue

@@ -369,6 +369,8 @@ export default {
 <style lang='scss' scoped>
 .content {
   width: 100%;
+  height: 90%;
+  overflow: auto;
   .content_left {
     width: 70%;
   }

+ 1 - 1
src/views/BasicSettings/SuppliersManage/SippliersList.vue

@@ -21,7 +21,7 @@
           :data="treeData"
           select-node
           children-key="sub"
-          style="width: 100%"
+          style="width: 100%;height:100%;overflow:auto"
           @on-select-change="handleTreeSelect"
           class="demo-tree-render"
         ></Tree>

+ 75 - 80
src/views/leadMatch/MatchList/HXYMatchCheck.vue

@@ -80,6 +80,29 @@
             </Select>
           </span>
         </Col>
+          <Col span="5">
+          <span>区域:</span>
+          <span>
+            <Select
+              filterable
+              multiple
+              filter-by-label
+              clearable
+              transfer
+              v-model="matchedInfo.t_region"
+              :max-tag-count="2"
+              size="small"
+              style="width: 150px"
+            >
+              <Option
+                v-for="(item, index) in regionList"
+                :key="index"
+                :label="item"
+                :value="item"
+              ></Option>
+            </Select>
+          </span>
+        </Col>
         <Col span="2">
           <Button @click="initData" size="small" type="primary">
             搜索
@@ -241,40 +264,15 @@
           </Col>
         </Row>
         <div v-if="matched_info.isCurrenct">
-          <div
-            v-for="(matched_detail, index) in matchedDetailList"
-            :key="index"
-          >
-            <Row type="flex" align="middle">
-              <Col span="10" style="padding:10px 0">
-                <span>匹配信息:</span>
-                <span
-                  v-for="(matched_info, index) in matched_detail.special"
-                  :key="index"
-                >
-                  {{ matched_info.key }}:{{ matched_info.value }}
-                </span>
-                <span>{{ matched_detail.num }}组</span>
-              </Col>
-              <Col span="2" offset="12" style="padding:10px 0">
-                <Button
-                  @click="handleHiddenMatchedDetail(matched_detail)"
-                  size="small"
-                  type="text"
-                >
-                  {{ matched_detail.isHidden ? "展开" : "收缩" }}
-                </Button>
-              </Col>
-            </Row>
+        
+       
             <Table
-              v-show="!matched_detail.isHidden"
               :columns="matchedSheetTableColumns"
               border
               :max-height="500"
-              :data="matched_detail.detail"
+              :data="matchedDetailList"
             >
             </Table>
-          </div>
         </div>
       </div>
     </div>
@@ -353,6 +351,7 @@ export default {
     // 这里存放数据
     return {
       delData:{
+        regionList:[],
         user_name:'',
         password:'',
       },
@@ -362,11 +361,12 @@ export default {
       isMatchedSelectAll: false,
       matchedInfo: {
         id: this.$route.query.id,
-        image_number: "",
-        product_name: "",
+        image_number: [],
+        product_name: [],
         region: [],
         number: [],
         part_name: [],
+        t_region:[],
       },
       urlMatchedList: [],
       productMatchedList: [],
@@ -376,58 +376,51 @@ export default {
       matchedDetailList: [],
       matchedList: [],
       matchedSheetTableColumns: [
-        { title: "序号", align: "center", type: "index", resizable: true,
-                        width: 100 },
-         { title: "组合名称", align: "center", key:'compose_name', resizable: true,
-                        width: 100 },
-        { title: "区域名称", align: "center", key: "region",  resizable: true,
-                        width: 160 },
-        { title: "房号", align: "center", key: "house_number",  resizable: true,
-                        width: 160 },
-        { title: "部件名称", align: "center", key: "part_name",  resizable: true,
-                        width: 180 },
-        { title: "行号", align: "center", key: "line",  resizable: true,
-                        width: 170 },
-        { title: "木皮1", align: "center", key: "skin1",  resizable: true,
-                        width: 160 },
+         { title: "序号", align: "center", type: "index", minWidth: 80 },
+        { title: "楼栋", align: "center",minWidth: 100,key:'house' },
+        { title: "单元", align: "center",minWidth: 100,key:'unit' },
+        { title: "楼层", align: "center", minWidth: 100,key:'layer'},
+         { title: "区域", align: "center", minWidth: 100,key:'region'},
+          { title: "户型", align: "center", minWidth: 100,key:'household'},
+          { title: "房号", align: "center", minWidth: 100,key:'house_number'},
+           { title: "生产数量", align: "center", minWidth: 100,key:'product_num'},
+          { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
+        { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         {
-          title: "材料",
+          title: "产品材料",
           align: "center",
-          resizable: true,
-                        width: 150,
-          render: (h, params) => {
-            return h("span", {}, params.row.board1 +';'+params.row.board2);
-          },
+          minWidth: 100,
+         key:'material_remark'
         },
-        { title: "木皮2", align: "center", key: "skin2", resizable: true,
-                        width: 150 },
-        { title: "毛料尺寸", align: "center", key: "wool_size",  resizable: true,
-                        width: 150 },
+        { title: "饰面名称", align: "center", key: "finish_remark", minWidth: 100 },
+        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 100 },
+        
+        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 100 },
         {
-          title: "原料数量",
+          title: "数量",
           align: "center",
-          key: "wool_number",
-          resizable: true,
-                        width: 100,
+          key: "num",
+          minWidth: 80,
         },
-        { title: "精裁尺寸", align: "center", key: "cut_size",  resizable: true,
-                        width: 100 },
         {
-          title: "零部件数量",
+          title: "贴皮方式",
           align: "center",
-          key: "num",
-           resizable: true,
-                        width: 100,
+          key: "cut_number",
+          minWidth: 90,
         },
-        { title: "贴皮面积", align: "center", key: "stick", resizable: true,
-                        width: 140 },
-        { title: "精裁面积", align: "center", key: "cut",  resizable: true,
-                        width: 140 },
-         { title: "是否打印", align: "center", key: "chip_state",  resizable: true,
-                        width: 80 ,  render: (h, params) => {
-            return h("span", {}, params.row.chip_state==0?'否':'是');
-          }},
-        { title: "工艺要求", align: "center", key: "remark", minWidth: 180 },
+        {
+          title: "封边",
+          align: "center",
+          key: "unbind_number",
+          minWidth: 90,
+        },
+        { title: "贴皮面积", align: "center", key: "skin_area", minWidth: 100 },
+        { title: "精裁面积", align: "center", key: "cut_area", minWidth: 100 },
+       { title: "备注", align: "center", key: "remark", minWidth: 80 },
+ { title: "打印芯片", align: "center", key: "", minWidth: 100,render:(h,params)=>{
+   const {row} = params;
+   return h('span',{},row.chip_state==1?'是':'否')
+ } },
       ], //匹配表头
       processModal: false,
       process_man: "",
@@ -454,7 +447,7 @@ export default {
   },
   methods: {
     important_del(){
-       this.axios.post('/api/delete_cut_order_product',{id:[...this.delList],...this.delData}).then(res=>{
+       this.axios.post('/api/delete_cut_order_product_2',{id:[...this.delList],...this.delData}).then(res=>{
          if(res.code == 200){
            this.$Message.success(res.msg);
            this.delList = [];
@@ -535,7 +528,7 @@ MatchedSelect(row,e){
         this.cut_order_product_ids = this.matchedSelectedList;
        
       }
-     this.axios.post('/api/bst_get_plan_time',{type:-1,id:this.cut_order_product_ids,order_no:this.$route.query.project_number}).then(res=>{
+     this.axios.post('/api/bst_pull',{type:-1,cut_order_product_ids:this.cut_order_product_ids,order_no:this.$route.query.project_number}).then(res=>{
           if(res.code == 200){
            this.processModal = true;
              let time = [];
@@ -580,13 +573,14 @@ MatchedSelect(row,e){
     },
     initData() {
       this.axios
-        .get("/api/bst_matching_on_list", {
-          params: {
+        .post("/api/bst_matching_on_list_2", 
+        {
             id: this.matchedInfo.id,
             image_number: this.matchedInfo.image_number,
             product_name: this.matchedInfo.product_name,
+            region:this.matchedInfo.t_region
           },
-        })
+        )
         .then((res) => {
           this.matchedList = [];
           res.data.list.map((v) => {
@@ -594,6 +588,7 @@ MatchedSelect(row,e){
           });
           this.urlMatchedList = res.data.image_number;
           this.productMatchedList = res.data.product_name;
+          this.regionList = res.data.region;
           // this.matchedList = res.data.list;
           res.data.list.forEach((v, index) => {
             if (v.matching_status == 2) {
@@ -622,7 +617,7 @@ MatchedSelect(row,e){
     getMatchedDetailList(row) {
       row.isCurrenct &&
         this.axios
-          .post("/api/bst_matching_on_detail", {
+          .post("/api/bst_matching_on_detail_2", {
             cut_order_product_id: row.id,
             id: this.matchedInfo.id,
             number: this.matchedInfo.number,
@@ -633,7 +628,7 @@ MatchedSelect(row,e){
             this.regionMatchedList = res.data.region;
             this.numberMatchedList = res.data.number;
             this.partNameMatchedList = res.data.part_name;
-            this.matchedDetailList = res.data.list;
+            this.matchedDetailList = res.data.list[0].detail;
           });
     },
   },

File diff suppressed because it is too large
+ 440 - 170
src/views/leadMatch/MatchList/HXYMatchPage.vue


+ 1 - 1
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://hxy_api.qingyaokeji.com" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";

Some files were not shown because too many files changed in this diff