稍微改了点家装--hw

src/components/Topsearch/index.vue

@@ -91,7 +91,7 @@
         ></DatePicker>
       </div>
     </div>
-    <Button v-if="showbtn" @click="searchData" :type="btnType" size="small">{{
+    <Button v-if="showbtn" @click="searchData" :type="btnType" :size="btn_size?btn_size:'small'">{{
       btnName
     }}</Button>
   </div>
@@ -100,6 +100,10 @@
 <script>
 export default {
   props: {
+    btn_size:{
+           type:String,
+           default:'default'
+    },
     list: {
       // type:Array,
       // required:true,
@@ -195,6 +199,7 @@ export default {
   display: inline-block;
 }
 .iten-title {
+  font-size:16px;
   color: #333;
 }
 </style>

src/views/Agreement/match/check.vue

@@ -157,7 +157,7 @@
                 transfer
                 clearable
                 filter-by-label
-                v-model="matchedInfo.part_name"
+                v-model="matchedInfo.product_title"
                 :max-tag-count="2"
                 size="small"
                 style="width: 150px"
@@ -545,31 +545,31 @@ export default {
       }
       this.processModal = true;
     },
-    initData() {
-      //获取table中的数据
-      this.axios
-        .get("/api/bst_matching_on_list", {
-          params: {
-            id: this.matchedInfo.id,
-            image_number: this.matchedInfo.image_number,
-            product_name: this.matchedInfo.product_name,
-          },
-        })
-        .then((res) => {
-          this.matchedList = [];
-          res.data.list.map((v) => {
-            v.isCurrenct = false;
-          });
-          this.urlMatchedList = res.data.image_number;
-          this.productMatchedList = res.data.product_name;
-          // this.matchedList = res.data.list;
-          res.data.list.forEach((v, index) => {
-            if (v.matching_status == 2) {
-              this.matchedList.push(v);
-            }
-          });
-        });
-    },
+    // initData() {
+    //   //获取table中的数据
+    //   this.axios
+    //     .get("/api/bst_matching_on_list", {
+    //       params: {
+    //         id: this.matchedInfo.id,
+    //         image_number: this.matchedInfo.image_number,
+    //         product_name: this.matchedInfo.product_name,
+    //       },
+    //     })
+    //     .then((res) => {
+    //       this.matchedList = [];
+    //       res.data.list.map((v) => {
+    //         v.isCurrenct = false;
+    //       });
+    //       this.urlMatchedList = res.data.image_number;
+    //       this.productMatchedList = res.data.product_name;
+    //       // this.matchedList = res.data.list;
+    //       res.data.list.forEach((v, index) => {
+    //         if (v.matching_status == 2) {
+    //           this.matchedList.push(v);
+    //         }
+    //       });
+    //     });
+    // },
     handleHiddenMatchedDetail(row) {
       if (row.isHidden) {
         row.isHidden = !row.isHidden;

src/views/OrderMannage/BusinessOrderlist/confirm.vue

@@ -312,50 +312,18 @@
             :key="process.id + 'bpp'"
             :field="process.id + ''"
             :title="process.name"
-            min-width="70"
+            min-width="100"
             :edit-render="{}"
           >
-            <template #edit="scope">
-              <Select
-                filterable
-                clearable
-                transfer
-                filter-by-label
-                v-if="!scope.row.is_metal"
-                label-in-value
-                v-model="scope.row[process.id]"
-                @on-change="changeEditProcess(scope.row, process)"
-              
-              >
-                <!-- @on-open-change="
-                  (e) =>
-                    handleGetProductProcess(
-                      e,
-                      null,
-                      scope.row,
-                      scope.row.process_obj.filter((v) => v.id == process.id)[0]
-                    )
-                " -->
-                <Option
-                   v-for="item in process.cld"
-                   :key="item.id"
-                   :value="item.id"
-                   :label="item.title"
-                ></Option>
-              </Select>
-            </template>
-            <template #default="{ row }">
-              {{
-                row.is_metal
-                  ? ""
-                  : getSelectedLabel(
-                      process.id,
-                      process.cld,
-                      'id',
-                      'title'
-                    )
-              }}</template
-            >
+             <template #default="{ row }">
+                <span>{{ getSelectedLabel(row[process.id],process.cld) }}</span>
+              </template>
+              <template #edit="{ row }">
+               <Select v-model="row[process.id]" filterable clearable transfer filter-by-label
+                label-in-value>
+                 <Option v-for="item in process.cld" :key="item.id" :value="item.id" :label="item.title"/>
+               </Select>
+              </template>
           </vxe-column>
          <!-- 根据字段拿到表头，高、宽、厚///////////////////////////////////////////////////////////////////////////////////////////// -->
                    <vxe-column v-for="measure in measure_total"
@@ -878,6 +846,7 @@
   export default {
     data() {
       return {
+        processOption:{value:'id',label:'title'},
         productList:[],//modal里面产品的下拉
         fax:0,//客户的折扣金额;
         users:[],//专营业务员
@@ -1054,7 +1023,7 @@
         },
       ],
        tableData:[
-              { id: 10001, name: 'Test1', nickname: 'T1', role: 'Develop', sex: '0', sex2: ['0'], num1: 40, age: 28, address: 'Shenzhen', date12: '', date13: '' },
+              { id: 10001, name: 'Test1', nickname: 'T1', role: 'Develop', sex: '0', sex2: ['0'], num1: 40, age: 28, address: 'Shenzhen', date12: '', date13: '' ,is_metal:false},
               // { id: 10002, name: 'Test2', nickname: 'T2', role: 'Designer', sex: '1', sex2: ['0', '1'], num1: 20, age: 22, address: 'Guangzhou', date12: '', date13: '2020-08-20' },
               // { id: 10003, name: 'Test3', nickname: 'T3', role: 'Test', sex: '0', sex2: ['1'], num1: 200, age: 32, address: 'Shanghai', date12: '2020-09-10', date13: '' },
               // { id: 10004, name: 'Test4', nickname: 'T4', role: 'Designer', sex: '1', sex2: ['1'], num1: 30, age: 23, address: 'Shenzhen', date12: '', date13: '2020-12-04' }
@@ -1144,6 +1113,12 @@
       url: "/api/bpp_list",
     }).then((res) => {
       if (res.code == 200) {
+        res.data.forEach(v=>{
+          v.cld.forEach(ele=>{
+            ele.value = ele.id;
+            ele.label = ele.title;
+          })
+        })
         this.bpp_list = res.data;
         // this.bpp_list.map((v) => {
         //   this.process_obj.push({
@@ -1382,14 +1357,14 @@
       handleGetProductProcess(){
 
       },
-      changeEditProcess(){
-
+      changeEditProcess(scope,item){
+          this.tableData[scope.rowIndex][item.id] = scope.row[item.id];
       },
-      getSelectedLabel(id,list,key,label){
-          const item = list.find(v=>{
-            return v[key] == id;
+      getSelectedLabel(id,list){
+          let item = list.find(v=>{
+            return v.id == id;
           })
-          return item?item[label]:null
+          return item?item.title:''
       },
       HandleAutoCreateNewLine(){
 

src/views/PayrollRequisition/detail.vue

@@ -6,7 +6,7 @@
                <!-- <Button type="primary" style="margin-right:20px" @click="postData">保存</Button> -->
            </Toptitle>
         <div style="height:90%;overflow:auto">
-            <Row class="row_item" :style="{ty}">
+            <Row class="row_item">
         <Col span="6" class="item">
         <label>请款单号：</label>
         <span v-if="type==3||state==2||state==1">{{formData.payment_no}}</span>
@@ -319,7 +319,7 @@ export default {
     },
     created(){
          this.type = this.$route.query.type;
-         this.show = type!=1?true:false;
+         this.show = this.type!=1?true:false;
          //获取部列表
          this.axios.get('/api/employee_depart_list').then(res=>{
            this.sectionList = res.data;

src/views/PayrollRequisition/edit.vue

@@ -6,7 +6,7 @@
                <Button type="primary" style="margin-right:20px" @click="postData">保存</Button>
            </Toptitle>
         <div style="height:90%;overflow:auto">
-            <Row class="row_item" :style="{ty}">
+            <Row class="row_item">
         <Col span="6" class="item">
         <label>请款单号：</label>
         <span v-if="type==3||state==2||state==1">{{formData.payment_no}}</span>
@@ -314,7 +314,7 @@ export default {
     },
     created(){
          this.type = this.$route.query.type;
-         this.show = type!=1?true:false;
+         this.show = this.type!=1?true:false;
          //获取部列表
          this.axios.get('/api/employee_depart_list').then(res=>{
            this.sectionList = res.data;

src/views/SealApprove/list.vue

@@ -21,27 +21,27 @@
                <Input class="form_item" placeholder="请搜索" v-model="searchData.project_title" clearable/>
            </FormItem>
            <FormItem label='用印人：'>
-               <Select class="form_item" v-model="searchData.user_id">
+               <Select class="form_item" v-model="searchData.user_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='部门负责人：'>
-               <Select class="form_item" v-model="searchData.section_id">
+               <Select class="form_item" v-model="searchData.section_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='待审人：'>
-               <Select class="form_item" v-model="searchData.pend_id">
+               <Select class="form_item" v-model="searchData.pend_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='审批人：'>
-                <Select class="form_item" v-model="searchData.check_id">
+                <Select class="form_item" v-model="searchData.check_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='审批状态：'>
-                  <Select class="form_item" v-model="searchData.state">
+                  <Select class="form_item" v-model="searchData.state" filterable clearable>
                       <Option :value="0" label="未提交审批"/>
                       <Option :value="1" label="已提交未审批"/>
                         <Option :value="2" label='已审批'/>

src/views/leadMatch/MatchList/HXYMatchPage.vue

@@ -101,15 +101,15 @@
             </Select>
           </span>
         </Col>
-        <Col style="margin-right:20px" v-if="currencyTag == 1">
+        <Col style="margin-right:20px" >
           <Button
             @click="
-              handleSearchUnmatchedInfo();
+              handleTabsClick(currencyTag);
               isClickMatch = false;
             "
             type="primary"
           >
-            确认
+            搜索
           </Button>
         </Col>
       </Row>
@@ -1213,14 +1213,14 @@ export default {
       name == 1 && this.handleSearchUnmatchedInfo();
     },
     handleMatchedListInit() {
-      this.axios
-        .get("/api/bst_matching_on_product_list_2", {
-          params: {
+      this.axios.post("/api/bst_matching_on_product_list_2", 
+          {
             id: this.info.id,
-            image_number: this.matchedInfo.image_number,
-            product_name: this.matchedInfo.product_name,
+            image_number: this.info.image_number,
+            product_name: this.info.product_name,
+            region:this.info.region
           },
-        })
+        )
         .then((res) => {
           res.data.list.map((v) => {
             v.isCurrenct = false;

src/views/leadMatch/weightMemo/HXYlist.vue

@@ -5,7 +5,7 @@
     </Toptitle>
     <div class="weight_memo_content">
       <div>
-        <Topsearch :list="list" @init="initData" @searchData="initData" />
+        <Topsearch :list="list" @init="initData" @searchData="initData"/>
       </div>
       <div
         style="
@@ -49,6 +49,7 @@ export default {
           value: "",
           placeholder: "请输入项目编号",
           serverName: "project_number",
+          size:'default'
         },
         {
           title: "项目名称",
@@ -56,6 +57,7 @@ export default {
           value: "",
           placeholder: "请输入项目名称",
           serverName: "project_name",
+          size:'default'
         },
         {
           title: "项目简称",
@@ -63,19 +65,20 @@ export default {
           value: "",
           placeholder: "请输入项目简称",
           serverName: "abbreviation",
+          size:'default'
         },
-        {
-          title: "匹配状态",
-          name: "Select",
-          value: "",
-          placeholder: "请选择",
-          serverName: "state",
-          option: [
-            { label: "匹配完成", value: 2 },
-            { label: "未匹配", value: 0 },
-             { label: "匹配中", value: 1 },
-          ] 
-        },
+        // {
+        //   title: "匹配状态",
+        //   name: "Select",
+        //   value: "",
+        //   placeholder: "请选择",
+        //   serverName: "state",
+        //   option: [
+        //     { label: "匹配完成", value: 2 },
+        //     { label: "未匹配", value: 0 },
+        //      { label: "匹配中", value: 1 },
+        //   ] 
+        // },
       ],
       tableColumns: [
         { title: "项目编码", key: "project_number", align: "center" , resizable: true,

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://124.71.176.88:882"
+    ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
     ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"