家装工装区分

src/views/BidSystem/TotalBoard/detail.vue

@@ -152,6 +152,10 @@ export default {
                 {type:'index',title:'序号',align:'center',minWidth:80},
                 {title:'物料分类',key:'type_title',minWidth:100,align:'center'},
                  {title:'物料名称',key:'material_title',minWidth:100,align:'center'},
+                 {title:'板材尺寸',key:'measure',minWidth:100,align:'center',render:(h,params)=>{
+                    const {row}=params;
+                       return h('span',{},`${row.long}*${row.wide}`)
+                 }},
                   {title:'计量单位',key:'unit',minWidth:100,align:'center'},
                    {title:'数量',key:'num',minWidth:100,align:'center'},
             ],

src/views/MatchChange/change.vue

@@ -249,6 +249,15 @@
               :data="matchedDetailList"
               @on-selection-change='selectItem'
             >
+            <template slot="area" slot-scope="{row}">
+           <Input clearable v-model="row.area" @on-blur='selectHouse(null,row)'></Input>
+            </template>
+            <template slot="part_title" slot-scope="{row}">
+             <Input clearable v-model="row.part_title" @on-blur='selectHouse(null,row)'></Input>
+            </template>
+            <template slot="measure" slot-scope="{row}">
+             <Input clearable v-model="row.measure" @on-blur='selectHouse(null,row)'></Input>
+            </template>
             <template slot="number" slot-scope="{row}">
               <Select v-model="row.house_id" filterable clearable @on-select='selectHouse($event,row)' transfer>
                 <Option v-for="(item,index) in house_list" :key="index" :label="item.number" :value="item.id"></Option>
@@ -354,13 +363,13 @@ export default {
         { title: "序号", align: "center", type: "index", resizable: true,
                         minWidth: 80 },
         { title: "区域名称", align: "center", key: "area",  resizable: true,
-                        minWidth: 160 },
+                        minWidth: 160 ,slot:'area'},
         { title: "房号", align: "center", key: "house_id",  resizable: true,
                         minWidth: 160,slot:'number' },
         { title: "组合名称", align: "center", key:'compose_name', resizable: true,
                         minWidth: 160,slot:'compose_name' },
         { title: "部件名称", align: "center", key: "part_title",  resizable: true,
-                        minWidth: 180 },
+                        minWidth: 180 ,slot:'part_title'},
         { title: "行号", align: "center", key: "sort",  resizable: true,
                         minWidth: 170 },
         {
@@ -368,9 +377,7 @@ export default {
           align: "center",
           resizable: true,
                         width: 150,
-          render: (h, params) => {
-            return h("span", {}, params.row.measure);
-          },
+         slot:'measure'
          },
       ], //匹配表头
       process_man: "",
@@ -477,6 +484,9 @@ export default {
         let json = [];
         this.editData.forEach(v=>{
           let obj ={};
+          obj.area = v.area;
+          obj.measure = v.measure;
+          obj.part_title = v.part_title;
           obj.pr_id = v.id;
           obj.house_id = v.house_id;
           obj.url_number = v.url_number;

src/views/OrderMannage/BusinessOrderlist/printlist.vue

@@ -148,21 +148,21 @@
                     <td class="amount-index" align="center">{{showTable.list.length + 1}}</td>
                     <td colspan="11"></td>
                     <td colspan="2">合计：</td>
-                    <td class="xt_total">{{Math.floor( showTable.foot.xt_total* 100) / 100}}</td>
+                    <td class="xt_total">{{showTable.foot.xt_total}}</td>
                     <td></td>
                 </tr>
 
                 <tr>
                     <td colspan="12" class="remark" style="padding-left: 20px;">{{showTable.foot.remark}}</td>
                     <td colspan="2">返点：</td>
-                    <td class="return">{{Math.floor( showTable.foot.return* 100) / 100}}</td>
+                    <td class="return">{{showTable.foot.return}}</td>
                     <td></td>
                 </tr>
 
                 <tr>
                     <td colspan="12" class="remark1" style="padding-left: 20px;">{{showTable.foot.remark1}}</td>
                     <td colspan="2">尾款：</td>
-                    <td class="end_price">{{Math.floor( showTable.foot.end_price* 100) / 100}}</td>
+                    <td class="end_price">{{showTable.foot.end_price}}</td>
                     <td></td>
                 </tr>
 
@@ -330,21 +330,21 @@
                     <td class="amount-index" align="center">{{showTable.list.length + 1}}</td>
                     <td colspan="11"></td>
                     <td colspan="2">合计：</td>
-                    <td class="xt_total">{{Math.floor( showTable.foot.xt_total* 100) / 100}}</td>
+                    <td class="xt_total">{{showTable.foot.xt_total}}</td>
                     <td></td>
                 </tr>
 
                 <tr>
                     <td colspan="12" class="remark" style="padding-left: 20px;">{{showTable.foot.remark}}</td>
                     <td colspan="2">返点：</td>
-                    <td class="return">{{Math.floor( showTable.foot.return* 100) / 100}}</td>
+                    <td class="return">{{showTable.foot.return}}</td>
                     <td></td>
                 </tr>
 
                 <tr>
                     <td colspan="12" class="remark1" style="padding-left: 20px;">{{showTable.foot.remark1}}</td>
                     <td colspan="2">尾款：</td>
-                    <td class="end_price">{{Math.floor( showTable.foot.end_price* 100) / 100}}</td>
+                    <td class="end_price">{{showTable.foot.end_price}}</td>
                     <td></td>
                 </tr>
 

src/views/ProductionOrderList/Deliverylist/matchIronware.vue

@@ -318,7 +318,7 @@ export default {
       if (data instanceof Array) {
         let tag = [];
         data.forEach((v) => {
-          tag.push(v.tag);
+          tag.push(v.tags);
         });
         this.axios
           .post("/api/orders_transport_alloy_print", { tag })
@@ -329,7 +329,7 @@ export default {
           });
       } else {
         this.axios
-          .post("/api/orders_transport_alloy_print", { tag: [data.tag] })
+          .post("/api/orders_transport_alloy_print", { tag: [data.tags] })
           .then((res) => {
             this.printDemo(res.data[0]);
           });
@@ -428,7 +428,7 @@ export default {
       this.detailProxyData = row;
       this.axios
         .get("/api/orders_transport_alloy_detail", {
-          params: { tag: row.tag, ...data },
+          params: { tag: row.tags, ...data },
         })
         .then((res) => {
           this.detailTableData = res.data.data;
@@ -438,7 +438,7 @@ export default {
     },
     del(row) {
       this.axios
-        .get("/api/orders_transport_alloy_del", { params: { tag: row.tag } })
+        .get("/api/orders_transport_alloy_del", { params: { tag: row.tags } })
         .then((res) => {
           if (res.code == 200) {
             this.$Message.success(res.msg);

vue.config.js

@@ -1,8 +1,8 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.37.173.82:82"
+    ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://124.71.176.88:882" //
+    ? "http://121.37.173.82:82" //
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";