|
@@ -80,6 +80,29 @@
|
|
|
</Select>
|
|
</Select>
|
|
|
</span>
|
|
</span>
|
|
|
</Col>
|
|
</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">
|
|
<Col span="2">
|
|
|
<Button @click="initData" size="small" type="primary">
|
|
<Button @click="initData" size="small" type="primary">
|
|
|
搜索
|
|
搜索
|
|
@@ -241,40 +264,15 @@
|
|
|
</Col>
|
|
</Col>
|
|
|
</Row>
|
|
</Row>
|
|
|
<div v-if="matched_info.isCurrenct">
|
|
<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
|
|
<Table
|
|
|
- v-show="!matched_detail.isHidden"
|
|
|
|
|
:columns="matchedSheetTableColumns"
|
|
:columns="matchedSheetTableColumns"
|
|
|
border
|
|
border
|
|
|
:max-height="500"
|
|
:max-height="500"
|
|
|
- :data="matched_detail.detail"
|
|
|
|
|
|
|
+ :data="matchedDetailList"
|
|
|
>
|
|
>
|
|
|
</Table>
|
|
</Table>
|
|
|
- </div>
|
|
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -353,6 +351,7 @@ export default {
|
|
|
// 这里存放数据
|
|
// 这里存放数据
|
|
|
return {
|
|
return {
|
|
|
delData:{
|
|
delData:{
|
|
|
|
|
+ regionList:[],
|
|
|
user_name:'',
|
|
user_name:'',
|
|
|
password:'',
|
|
password:'',
|
|
|
},
|
|
},
|
|
@@ -362,11 +361,12 @@ export default {
|
|
|
isMatchedSelectAll: false,
|
|
isMatchedSelectAll: false,
|
|
|
matchedInfo: {
|
|
matchedInfo: {
|
|
|
id: this.$route.query.id,
|
|
id: this.$route.query.id,
|
|
|
- image_number: "",
|
|
|
|
|
- product_name: "",
|
|
|
|
|
|
|
+ image_number: [],
|
|
|
|
|
+ product_name: [],
|
|
|
region: [],
|
|
region: [],
|
|
|
number: [],
|
|
number: [],
|
|
|
part_name: [],
|
|
part_name: [],
|
|
|
|
|
+ t_region:[],
|
|
|
},
|
|
},
|
|
|
urlMatchedList: [],
|
|
urlMatchedList: [],
|
|
|
productMatchedList: [],
|
|
productMatchedList: [],
|
|
@@ -376,58 +376,51 @@ export default {
|
|
|
matchedDetailList: [],
|
|
matchedDetailList: [],
|
|
|
matchedList: [],
|
|
matchedList: [],
|
|
|
matchedSheetTableColumns: [
|
|
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",
|
|
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",
|
|
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",
|
|
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,
|
|
processModal: false,
|
|
|
process_man: "",
|
|
process_man: "",
|
|
@@ -454,7 +447,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
important_del(){
|
|
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){
|
|
if(res.code == 200){
|
|
|
this.$Message.success(res.msg);
|
|
this.$Message.success(res.msg);
|
|
|
this.delList = [];
|
|
this.delList = [];
|
|
@@ -535,7 +528,7 @@ MatchedSelect(row,e){
|
|
|
this.cut_order_product_ids = this.matchedSelectedList;
|
|
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){
|
|
if(res.code == 200){
|
|
|
this.processModal = true;
|
|
this.processModal = true;
|
|
|
let time = [];
|
|
let time = [];
|
|
@@ -580,13 +573,14 @@ MatchedSelect(row,e){
|
|
|
},
|
|
},
|
|
|
initData() {
|
|
initData() {
|
|
|
this.axios
|
|
this.axios
|
|
|
- .get("/api/bst_matching_on_list", {
|
|
|
|
|
- params: {
|
|
|
|
|
|
|
+ .post("/api/bst_matching_on_list_2",
|
|
|
|
|
+ {
|
|
|
id: this.matchedInfo.id,
|
|
id: this.matchedInfo.id,
|
|
|
image_number: this.matchedInfo.image_number,
|
|
image_number: this.matchedInfo.image_number,
|
|
|
product_name: this.matchedInfo.product_name,
|
|
product_name: this.matchedInfo.product_name,
|
|
|
|
|
+ region:this.matchedInfo.t_region
|
|
|
},
|
|
},
|
|
|
- })
|
|
|
|
|
|
|
+ )
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
this.matchedList = [];
|
|
this.matchedList = [];
|
|
|
res.data.list.map((v) => {
|
|
res.data.list.map((v) => {
|
|
@@ -594,6 +588,7 @@ MatchedSelect(row,e){
|
|
|
});
|
|
});
|
|
|
this.urlMatchedList = res.data.image_number;
|
|
this.urlMatchedList = res.data.image_number;
|
|
|
this.productMatchedList = res.data.product_name;
|
|
this.productMatchedList = res.data.product_name;
|
|
|
|
|
+ this.regionList = res.data.region;
|
|
|
// this.matchedList = res.data.list;
|
|
// this.matchedList = res.data.list;
|
|
|
res.data.list.forEach((v, index) => {
|
|
res.data.list.forEach((v, index) => {
|
|
|
if (v.matching_status == 2) {
|
|
if (v.matching_status == 2) {
|
|
@@ -622,7 +617,7 @@ MatchedSelect(row,e){
|
|
|
getMatchedDetailList(row) {
|
|
getMatchedDetailList(row) {
|
|
|
row.isCurrenct &&
|
|
row.isCurrenct &&
|
|
|
this.axios
|
|
this.axios
|
|
|
- .post("/api/bst_matching_on_detail", {
|
|
|
|
|
|
|
+ .post("/api/bst_matching_on_detail_2", {
|
|
|
cut_order_product_id: row.id,
|
|
cut_order_product_id: row.id,
|
|
|
id: this.matchedInfo.id,
|
|
id: this.matchedInfo.id,
|
|
|
number: this.matchedInfo.number,
|
|
number: this.matchedInfo.number,
|
|
@@ -633,7 +628,7 @@ MatchedSelect(row,e){
|
|
|
this.regionMatchedList = res.data.region;
|
|
this.regionMatchedList = res.data.region;
|
|
|
this.numberMatchedList = res.data.number;
|
|
this.numberMatchedList = res.data.number;
|
|
|
this.partNameMatchedList = res.data.part_name;
|
|
this.partNameMatchedList = res.data.part_name;
|
|
|
- this.matchedDetailList = res.data.list;
|
|
|
|
|
|
|
+ this.matchedDetailList = res.data.list[0].detail;
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|