Merge branch 'hw' of 121.41.102.225:Nidong/jiufang

src/views/Agreement/edit.vue

@@ -53,11 +53,11 @@
               <span class="form_span" v-else>{{formData.customer_id}}</span>
           </FormItem>
            <FormItem label='投标金额：'>
-              <Input v-model="formData.bid_price" placeholder="请输入投标金额" class="form_item" clearable v-if="$route.query.type==1||$route.query.type==2"  :disabled='$route.query.type!=1'/>
+              <Input v-model="formData.bid_price" placeholder="自动生成" class="form_item" clearable v-if="$route.query.type==1||$route.query.type==2"  :disabled='true'/>
               <span class="form_span" v-else>{{formData.bid_price}}</span>
           </FormItem>
           <FormItem label='合同金额：'>
-              <Input placeholder="请输入合同金额" v-model="formData.agreement_price" class="form_item" clearable v-if="$route.query.type==1||$route.query.type==2"/>
+              <Input placeholder="自动生成" v-model="formData.agreement_price" class="form_item" clearable v-if="$route.query.type==1||$route.query.type==2" disabled/>
               <span class="form_span" v-else>{{formData.agreement_price}}</span>
           </FormItem>
           <FormItem label='核量金额：'>
@@ -212,18 +212,18 @@ export default {
             },
             tableData:[],
             tableColumns:[
-                {type:'selection',minWidth:80,align:'center',key:'select'},
+                {type:'selection',minWidth:40,align:'center',key:'select'},
                 {title:'序号',type:'index',align:'center',minWidth:80,key:'index'},
                 {title:'区域',minWidth:100,align:'center',key:'region'},
                 {title:'产品分类',minWidth:100,align:'center',key:'bp_id',slot:'bp_id'},
                 {title:'产品名称',minWidth:100,align:'center',key:'product_title'},
                 {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'},
+                {title:'产品特征',minWidth:200,align:'center',key:'product_feature'},
+                {title:'计量单位',minWidth:60,align:'center',key:'unit'},
+                {title:'工程量',minWidth:80,align:'center',key:'num'},
                 {title:'投标单价',minWidth:100,align:'center',key:'bid_price'},
                 {title:'投标金额',minWidth:100,align:'center',key:'total_bid_price',slot:'total_bid_price'},
-                {title:'操作',minWidth:100,align:'center',key:'set',slot:'set'}
+                {title:'操作',minWidth:60,align:'center',key:'set',slot:'set'}
             ],
              editTableColumns:[
                 {title:'序号',type:'index',align:'center',minWidth:80,key:'index'},
@@ -309,6 +309,8 @@ export default {
         changePhase(e){
                if(e.indexOf(5)>=0){
                    this.formData.agreement_price = this.formData.bid_price;
+               }else{
+                   this.formData.agreement_price = '';
                }
         },
         getPhase(){
@@ -564,6 +566,10 @@ export default {
                        i--;
                    }
              }
+             if(this.tableData.length==0){
+                 this.formData.bid_price = '';
+                 this.formData.agreement_price = ''
+             }
                    }
              })
           

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -241,13 +241,13 @@ export default {
         {
           title: "房间号",
           align: "center",
-          minWidth: 100,
+          minWidth: 200,
           key: "number_detail",
           render: (h, params) => {
             const { row } = params;
             return h(
               "span",
-              `${row.house}-${row.unit}-${row.layer}-${row.number_detail}`
+              `${row.house?`${row.house}-`:''}${row.unit?`${row.unit}-`:''}${row.layer?`${row.layer}-`:''}${row.number_detail}`
             );
           },
         },

src/views/ProductionOrderList/InboundForm/details.vue

@@ -368,7 +368,7 @@ export default {
             const { row } = params;
             return h(
               "span",
-              `${row.house}-${row.unit}-${row.layer}-${row.number_detail}`
+              `${row.house?`${row.house}-`:''}${row.unit?`${row.unit}-`:''}${row.layer?`${row.layer}-`:''}${row.number_detail}`
             );
           },
         },

src/views/leadMatch/MatchList/HXYMatchPage.vue

@@ -624,7 +624,7 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.part_name"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
@@ -647,13 +647,13 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.cut_area"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
                   >
                     <Option
-                      v-for="(item, index) in partNameMatchedList"
+                      v-for="(item, index) in cutAreaMatchedList"
                       :key="index"
                       :label="item"
                       :value="item"
@@ -670,13 +670,13 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.house"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
                   >
                     <Option
-                      v-for="(item, index) in partNameMatchedList"
+                      v-for="(item, index) in houseMatchedList"
                       :key="index"
                       :label="item"
                       :value="item"
@@ -693,13 +693,13 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.unit"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
                   >
                     <Option
-                      v-for="(item, index) in partNameMatchedList"
+                      v-for="(item, index) in unitMatchedList"
                       :key="index"
                       :label="item"
                       :value="item"
@@ -716,13 +716,13 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.layer"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
                   >
                     <Option
-                      v-for="(item, index) in partNameMatchedList"
+                      v-for="(item, index) in layerMatchedList"
                       :key="index"
                       :label="item"
                       :value="item"
@@ -741,7 +741,7 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.region"
+                    v-model="matchedData.region"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
@@ -763,13 +763,13 @@
                     multiple
                     transfer
                     filter-by-label
-                    v-model="matchedInfo.part_name"
+                    v-model="matchedData.household"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
                   >
                     <Option
-                      v-for="(item, index) in partNameMatchedList"
+                      v-for="(item, index) in householdMatchedList"
                       :key="index"
                       :label="item"
                       :value="item"
@@ -786,7 +786,7 @@
                     transfer
                     clearable
                     filter-by-label
-                    v-model="matchedInfo.number"
+                    v-model="matchedData.number"
                     :max-tag-count="2"
                     size="small"
                     style="width: 150px"
@@ -880,6 +880,9 @@ export default {
   data() {
     // 这里存放数据
     return {
+      matchedData:{
+        
+      },
       totalRoomState:false,
       totalUrlState:false,
      matchFinishData:[],
@@ -901,6 +904,7 @@ export default {
         id: this.$route.query.id,
         image_number: [],
         product_name: [],
+
       },
       cut_size: [], //精裁尺寸 未匹配
       number: [], //房号 未匹配
@@ -915,6 +919,11 @@ export default {
       regionMatchedList: [], //区域列表 已匹配
       numberMatchedList: [], //房号列表 已匹配
       partNameMatchedList: [], //部件列表 已匹配
+      cutAreaMatchedList:[],//精裁尺寸 已匹配
+      houseMatchedList:[],//楼栋 已匹配
+      unitMatchedList:[],//单元 已匹配
+      layerMatchedList:[],//楼层 已匹配
+      householdMatchedList:[],//户型 已匹配
       unmatchedObj: {
         urlList: [], //图号列表
         part_list: [], //当前图号下表格列表
@@ -1263,10 +1272,13 @@ export default {
     },
     handleShowCurrencyMatched(row) {
       if (row.isCurrenct) {
+        
         row.isCurrenct = !row.isCurrenct;
       } else {
+        this.matchedData = {};
         this.matchedList.map((v) => (v.isCurrenct = false));
         row.isCurrenct = true;
+        
       }
       this.getMatchedDetailList(row);
     },
@@ -1382,19 +1394,24 @@ export default {
     getMatchedDetailList(row) {
       row.isCurrenct &&
         this.axios
-          .get("/api/bst_matching_on_product_detail_2", {
-            params: {
+          .post("/api/bst_matching_on_product_detail_2", {
               cut_order_product_id: row.id || 14,
-              id: this.matchedInfo.id,
+              id:this.$route.query.id,
+              ...this.matchedData
               // number: this.matchedInfo.number,
               // part_name: this.matchedInfo.part_name,
               // region: this.matchedInfo.region,
-            },
+            
           })
           .then((res) => {
             this.regionMatchedList = res.data.region;
             this.numberMatchedList = res.data.number;
             this.partNameMatchedList = res.data.part_name;
+             this.cutAreaMatchedList = res.data.cut_area;//精裁尺寸 已匹配
+      this.houseMatchedList = res.data.house;//楼栋 已匹配
+      this.unitMatchedList = res.data.unit;//单元 已匹配
+      this.layerMatchedList = res.data.layer;//楼层 已匹配
+      this.householdMatchedList = res.data.household;
             this.matchedDetailList = res.data.list[0].detail;
           });
     },