src/api/product/personboard.js
@@ -509,3 +509,11 @@ params: query }) } export function getOperationTaskCopy(query) { return request({ url: '/mes/operationTask/getOperationTaskCopy', method: 'get', params: query }) } src/views/plan/customer/index.vue
@@ -242,6 +242,7 @@ }, handleSelectionChange(val) { this.multipleSelection = val console.log(this.multipleSelection); }, // å é¤ deleteHandle(row) { src/views/plan/customerorder/customerorder-form.vue
@@ -828,6 +828,7 @@ productName: '', productType: '', partNo: '', technologyDocumentId: '', docNumber: '', docName: '', shippingAddress: '', src/views/plan/customerorder/index.vue
@@ -975,6 +975,7 @@ // å建主ç产计å masterPlanHandle() { console.log(this.multipleSelection); if (this.multipleSelection && this.multipleSelection.length > 0) { if (this.judgeCoState(this.multipleSelection)) { // å¤æä¸ä¸å©ä½æ°éæ¯å¦å¤§äº0 src/views/plan/customerorder/schedule-table.vue
@@ -222,11 +222,13 @@ this.dataForm.customer = [] const _that = this customer.forEach((item) => { console.log(item); const outPutBatchList = [] _that.$set(item, 'outPutBatchList', outPutBatchList) customerList.push(item) }) this.dataForm.customer = JSON.parse(JSON.stringify(customerList)) console.log(this.dataForm.customer); }) }, dataFormSubmit() { src/views/product/workbench/batchproductout-form-new.vue
@@ -8,8 +8,8 @@ --> <template> <el-dialog width="95%" title="æ¹é产åº" width="90%" title="æ±æ¥äº§åº" :visible.sync="innerVisible" append-to-body @close="$emit('update:currshowlist', false)" @@ -18,7 +18,7 @@ class="batch-product-out-form" > <div style="float: left;width: 15%;box-sizing: border-box;padding-right: 34px;position: relative" style="float: left;width: 20%;box-sizing: border-box;padding-right: 34px;position: relative" > <el-table stripe @@ -48,7 +48,7 @@ style="position: absolute;top:0px;right: 0px;height: 100%;width: 34px;border-left: 1px solid #f4f2ea;border-right: 1px solid #f4f2ea;" ></div> </div> <div style="float: left;width: 85%"> <div style="float: left;width: 80%"> <el-row style=""> <el-col :span="1" class="batch-product-out-form-header-col" ><span>åºå·</span></el-col @@ -58,9 +58,9 @@ ><span>é¶ä»¶å称</span></el-col > <el-col :span="4" class="batch-product-out-form-header-col" ><span>SNå·</span></el-col ><span>åºåå·</span></el-col > <el-col :span="2" class="batch-product-out-form-header-col" <!-- <el-col :span="2" class="batch-product-out-form-header-col" ><span>è½½å ·ç¼å·</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" @@ -68,34 +68,40 @@ > <el-col :span="1" class="batch-product-out-form-header-col" ><span>æ¯ç产é</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" > --> <!-- <el-col :span="1" class="batch-product-out-form-header-col" ><span>èµ·å§ç±³æ </span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" ><span>æªæ¢ç±³æ </span></el-col > > --> <el-col :span="1" class="batch-product-out-form-header-col" ><span>åä½</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" ><span>å段æè¿°</span></el-col <el-col :span="2" class="batch-product-out-form-header-col" ><span>WDRå·</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" <!-- <el-col :span="1" class="batch-product-out-form-header-col" ><span>å段æè¿°</span></el-col > --> <el-col :span="2" class="batch-product-out-form-header-col" ><span>ç产æ°é</span></el-col > <el-col :span="2" class="batch-product-out-form-header-col" ><span>æ¥åºæ°é</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" <!-- <el-col :span="1" class="batch-product-out-form-header-col" ><span>çå ·éé</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" > --> <!-- <el-col :span="1" class="batch-product-out-form-header-col" ><span>æ¯é</span></el-col > > --> <!--<el-col :span="1" class="batch-product-out-form-header-col" ><span>IFSæ¹æ¬¡å·</span></el-col >--> <el-col :span="2" class="batch-product-out-form-header-col" <el-col :span="3" class="batch-product-out-form-header-col" ><span>ç产人å</span></el-col ><el-col :span="1" class="batch-product-out-form-header-col" ><el-col :span="2" class="batch-product-out-form-header-col" ><span>å¤æ³¨</span></el-col > <el-col :span="1" class="batch-product-out-form-header-col" @@ -127,24 +133,12 @@ <span class="inline-el-hidden">{{ item.partName }}</span> </el-tooltip> </el-col> <el-col :span="4" class="batch-product-out-form-body-col"> <span v-show="!item.batchNoEdit">{{ item.outBatchNo }}</span> <!--<el-input v-show="item.batchNoEdit" v-model="item.outBatchNo"> <i slot="prefix" class="el-input__icon el-icon-search" style="cursor:pointer" @click="openOutPutBatch(item)" ></i> <i slot="suffix" class="el-input__icon el-icon-circle-close" style="cursor:pointer" @click="cleanOutBatchNo(item)" ></i> </el-input>--> <el-col :span="4" class="batch-product-out-form-body-col l-mes"> <!-- <span>{{ item.outBatchNo }}</span> --> <el-input v-model="item.outBatchNo"> </el-input> </el-col> <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <!-- <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.reelNumber"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> @@ -152,32 +146,38 @@ </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <span>{{ item.productQty }}</span> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> </el-col> --> <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.startMeterMark"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.endMeterMark"></el-input> </el-col> </el-col> --> <el-col :span="1" class="batch-product-out-form-body-col"> <span>{{ item.unit }}</span> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.segmentDesc"></el-input> <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.wdr"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.segmentDesc"></el-input> </el-col> --> <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.outNum"></el-input> </el-col> <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.scrapQty"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.reelWeight"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> </el-col> --> <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.grossWeight"></el-input> </el-col> </el-col> --> <!--<el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.ifsBatchNo"></el-input> </el-col>--> <el-col :span="2" class="batch-product-out-form-body-col"> <el-col :span="3" class="batch-product-out-form-body-col"> <el-tooltip class="item" effect="dark" @@ -190,7 +190,7 @@ <!--<el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.remark"></el-input> </el-col>--> <el-col :span="1" class="batch-product-out-form-body-col l-mes"> <el-col :span="2" class="batch-product-out-form-body-col l-mes"> <el-input v-model="item.mainRemark"></el-input> </el-col> <el-col :span="1" class="batch-product-out-form-body-col"> @@ -205,19 +205,19 @@ </div> </div> <div slot="footer" class="dialog-footer"> <div style="display: inline-block;width: 25%;float: left"> <!-- <div style="display: inline-block;width: 25%;float: left"> <el-button style="margin-right: 34px" type="primary" @click="addProductOutForPerson" >æ·»å </el-button > </div> </div> --> <el-button @click="innerVisible = false">å æ¶</el-button> <el-button type="primary" :disabled="saveDisabled" @click="saveProductOuts" @click="saveProductOuts2" >ç¡® å®</el-button > </div> @@ -314,7 +314,8 @@ batchSaveProductMain, getShiftProductOutByOpIdAndWsId, validateOverProduction, validateOverFeed validateOverFeed, submitProductMain } from '@/api/product/personboard' import ElButton from '../../../../node_modules/element-ui/packages/button/src/button.vue' import OutPutBatch from './outputbatch.vue' @@ -498,10 +499,39 @@ // row.outBatchNo = null } }, saveProductOuts2() { this.clickDateArr.push(new Date().getTime()) var productOutputList = [] this.productList.forEach(a=>{ productOutputList.push({ partId: a.partId, productQty: a.outNum, outBatchNo: a.outBatchNo, scrapQty: a.scrapQty, remark: a.remark, wdr: a.wdr, staffNo: a.staffNo, staffName: a.staffName, status: a.status, dutyRecordId: a.dutyRecordId, productStaffIds: a.productStaffIds, productStaffs: a.productStaffs }) }) var productMains = { productOutputList: productOutputList, workstationId: this.parentInfo.workstationId, operationTaskId: this.parentInfo.operationTaskId, } submitProductMain(productMains).then(res=>{ this.$emit('refreshProductOutputList', res.data.data) this.innerVisible = false }) }, saveProductOuts() { var canClickFlag = true this.clickDateArr.push(new Date().getTime()) if (this.clickDateArr.length > 1) { /* if (this.clickDateArr.length > 1) { if ( this.clickDateArr[this.clickDateArr.length - 1] - this.clickDateArr[this.clickDateArr.length - 2] < @@ -510,7 +540,7 @@ // å°äº2ç§å认为éå¤æ交 canClickFlag = false } } } */ if (canClickFlag) { this.saveDisabled = true @@ -538,56 +568,56 @@ s_list = JSON.parse(JSON.stringify(p_list)) } if (s_list.length <= 0) { /* if (s_list.length <= 0) { this.$message.error('æ¥å·¥ï¼è¯·å¡«åçæ°ï¼') this.saveDisabled = false return } let totalDisNumber = 0 for (let i = 0; i < s_list.length; i++) { // çæ°æ ¡éª if (!this.isPositiveIntegerNumber(s_list[i].disNumber)) { validateFlag = false if (this.groupStatus) { validateMsg = '人åï¼' + s_list[i].staffName + 'ï¼æå¨è¡ï¼ãçæ°ã请è¾å ¥æ£æ´æ°ï¼' } else { validateMsg = '第' + (i + 1) + 'è¡ï¼ãçæ°ã请è¾å ¥æ£æ´æ°ï¼' } break } totalDisNumber += s_list[i].disNumber - 0 // èµ·å§ç±³æ æ ¡éª if (!this.isNumber(s_list[i].startMeterMark)) { validateFlag = false validateMsg = '第' + (i + 1) + 'è¡ï¼ãèµ·å§ç±³æ ã请è¾å ¥éè´æ°ï¼å°æ°ä½æå¤4ä½ï¼' break } // æªæ¢ç±³æ æ ¡éª if (!this.isNumber(s_list[i].endMeterMark)) { validateFlag = false validateMsg = '第' + (i + 1) + 'è¡ï¼ãæªæ¢ç±³æ ã请è¾å ¥éè´æ°ï¼å°æ°ä½æå¤4ä½ï¼' break } // æªæ¢ç±³æ é大äºå¼å§ç±³æ if ( Number(s_list[i].endMeterMark) < Number(s_list[i].startMeterMark) ) { validateFlag = false validateMsg = '第' + (i + 1) + 'è¡ï¼ãæªæ¢ç±³æ ãé大äºãèµ·å§ç±³æ ã' break } } const maxDisNumber = 2000 // æ大çæ° } */ // let totalDisNumber = 0 // for (let i = 0; i < s_list.length; i++) { // // çæ°æ ¡éª // /* if (!this.isPositiveIntegerNumber(s_list[i].disNumber)) { // validateFlag = false // if (this.groupStatus) { // validateMsg = // '人åï¼' + // s_list[i].staffName + // 'ï¼æå¨è¡ï¼ãçæ°ã请è¾å ¥æ£æ´æ°ï¼' // } else { // validateMsg = '第' + (i + 1) + 'è¡ï¼ãçæ°ã请è¾å ¥æ£æ´æ°ï¼' // } // break // } */ // totalDisNumber += s_list[i].disNumber - 0 // // èµ·å§ç±³æ æ ¡éª // if (!this.isNumber(s_list[i].startMeterMark)) { // validateFlag = false // validateMsg = // '第' + (i + 1) + 'è¡ï¼ãèµ·å§ç±³æ ã请è¾å ¥éè´æ°ï¼å°æ°ä½æå¤4ä½ï¼' // break // } // // æªæ¢ç±³æ æ ¡éª // if (!this.isNumber(s_list[i].endMeterMark)) { // validateFlag = false // validateMsg = // '第' + (i + 1) + 'è¡ï¼ãæªæ¢ç±³æ ã请è¾å ¥éè´æ°ï¼å°æ°ä½æå¤4ä½ï¼' // break // } // // æªæ¢ç±³æ é大äºå¼å§ç±³æ // if ( // Number(s_list[i].endMeterMark) < Number(s_list[i].startMeterMark) // ) { // validateFlag = false // validateMsg = // '第' + (i + 1) + 'è¡ï¼ãæªæ¢ç±³æ ãé大äºãèµ·å§ç±³æ ã' // break // } // } /* const maxDisNumber = 2000 // æ大çæ° if (totalDisNumber > maxDisNumber) { validateMsg = 'æ»çæ°ä¸è½å¤§äº' + maxDisNumber + 'ï¼' validateFlag = false } } */ if (validateFlag) { if (this.parentInfo.productOutId == null) { // å½åæ¯äº§åºçæ°å¢ src/views/product/workbench/feed-form.vue
@@ -29,26 +29,26 @@ > </el-table-column> <el-table-column prop="partName" prop="partDescription" header-align="center" align="center" label="é¶ä»¶" label="é¶ä»¶æè¿°" > </el-table-column> <el-table-column prop="partBatchNo" prop="ifsBatchNo" header-align="center" align="center" label="é¶ä»¶æ¹å·" label="æ¹å·" > </el-table-column> <el-table-column <!-- <el-table-column prop="specs" header-align="center" align="center" label="è§æ ¼åå·" > </el-table-column> </el-table-column> --> <el-table-column prop="suppliedQuantity" header-align="center" @@ -203,7 +203,6 @@ partNoList.push(partNoLists) } getCheckRawPart(partNoList).then((response) => { console.log(response) if (response.data.code === 0) { // éè¦å¯ç 确认æ åµ if (response.data.data.success === false) { @@ -243,7 +242,15 @@ partBatchNo: this.dataList[i].partBatchNo, systemNo: this.dataList[i].systemNo, partName: this.dataList[i].partName, unit: this.dataList[i].unit ? this.dataList[i].unit : '' unit: this.dataList[i].unit ? this.dataList[i].unit : '', partNo: this.dataList[i].partNo, ifsBatchNo: this.dataList[i].ifsBatchNo, ifsWdr: this.dataList[i].ifsWdr, locationNo: this.dataList[i].locationNo, serialNo:this.dataList[i].serialNo, engChgLevel:this.dataList[i].engChgLevel, configurationId:this.dataList[i].configurationId, activitySeq:this.dataList[i].activitySeq } feeds.push(feed) } src/views/product/workbench/feed-pane.vue
@@ -1,7 +1,7 @@ <template> <div style="padding:0px 14px;height: 100%;overflow: auto;"> <div class="need-feed-header"> <div style="height:28px;line-height:28px;"> <div> <el-divider class="pane-divider" direction="vertical"></el-divider ><span style="font-size:14px;font-weight:bold">å·¥åæéç©æ</span> </div> @@ -205,7 +205,7 @@ <span>{{ scope.row.partNo }}</span> </template> </el-table-column> <el-table-column <!-- <el-table-column label="é¶ä»¶" prop="partName" align="center" @@ -227,11 +227,11 @@ <template slot-scope="scope"> <span>{{ scope.row.partName }}</span> </template> </el-table-column> </el-table-column> --> <el-table-column label="é¶ä»¶æè¿°" prop="partDescription" align="center" align="center" show-overflow-tooltip > <template slot="header"> <div style="line-height: 14px;">é¶ä»¶æè¿°</div> @@ -268,7 +268,25 @@ <span>{{ scope.row.ifsBatchNo }}</span> </template> </el-table-column> <el-table-column label="SNå·" prop="partBatchNo" align="center"> <el-table-column label="WDRå·" prop="ifsWdr" align="center"> <template slot="header"> <div style="line-height: 14px;">WDRå·</div> <div class="th" @click.stop> <el-input type="text" v-model="queryParamTwo.ifsWdr" @keyup.enter.native="handleStockList" clearable @clear="handleStockList" size="mini" ></el-input> </div> </template> <template slot-scope="scope"> <span>{{ scope.row.ifsWdr }}</span> </template> </el-table-column> <!-- <el-table-column label="SNå·" prop="partBatchNo" align="center"> <template slot="header"> <div style="line-height: 14px;">SNå·</div> <div class="th" @click.stop> @@ -308,8 +326,8 @@ <template slot-scope="scope"> <span>{{ scope.row.reelNumber }}</span> </template> </el-table-column> <el-table-column </el-table-column> --> <!-- <el-table-column label="è§æ ¼åå·" prop="specs" align="center" @@ -331,7 +349,7 @@ <template slot-scope="scope"> <span>{{ scope.row.specs }}</span> </template> </el-table-column> </el-table-column> --> <el-table-column label="åä½" prop="unit" align="center"> <template slot="header"> <div style="line-height: 14px;">åä½</div> @@ -357,7 +375,7 @@ > <template slot="header"> <div style="line-height: 14px;">å¯ç¨æ°é</div> <div class="th" @click.stop> <!-- <div class="th" @click.stop> <el-input type="text" v-model="queryParamTwo.availableStockQuantity" @@ -366,7 +384,7 @@ @clear="handleStockList" size="mini" ></el-input> </div> </div> --> </template> <template slot-scope="scope"> <span>{{ scope.row.availableStockQuantity }}</span> @@ -375,7 +393,7 @@ <el-table-column label="åºåæ°é" prop="stockQuantity" align="center"> <template slot="header"> <div style="line-height: 14px;">åºåæ°é</div> <div class="th" @click.stop> <!-- <div class="th" @click.stop> <el-input type="text" v-model="queryParamTwo.stockQuantity" @@ -384,7 +402,7 @@ @clear="handleStockList" size="mini" ></el-input> </div> </div> --> </template> <template slot-scope="scope"> <span>{{ scope.row.stockQuantity }}</span> @@ -397,7 +415,7 @@ > <template slot="header"> <div style="line-height: 14px;">é¢çæ°é</div> <div class="th" @click.stop> <!-- <div class="th" @click.stop> <el-input type="text" v-model="queryParamTwo.reserveQuantity" @@ -406,7 +424,7 @@ @clear="handleStockList" size="mini" ></el-input> </div> </div> --> </template> <template slot-scope="scope"> <span>{{ scope.row.reserveQuantity }}</span> @@ -431,7 +449,7 @@ </template> </el-table-column> </el-table> <div class="pagin-page" style="margin-top: 0;margin-bottom: 0;"> <!-- <div class="pagin-page" style="margin-top: 0;margin-bottom: 0;"> <el-pagination :current-page="queryReport.current" :page-sizes="[10, 15, 20, 50, 100]" @@ -442,11 +460,9 @@ :total="queryReport.total" > </el-pagination> </div> </div> --> </el-tab-pane> <!-- --> <el-tab-pane name="second" label="线边ä»å¾ å¤çç©æ"> <!-- <el-tab-pane name="second" label="线边ä»å¾ å¤çç©æ"> <div class="line-side-warehouse-header"> <div> <el-divider class="pane-divider" direction="vertical"></el-divider @@ -568,9 +584,9 @@ align="center" show-overflow-tooltip > <template slot="header"> <template slot="header"> --> <!-- <div style="line-height: 14px;">IFSæ¹æ¬¡å·</div> --> <div class="th" @click.stop> <!-- <div class="th" @click.stop> <el-input type="text" v-model="queryTodoParam.ifsBatchNo" @@ -765,10 +781,10 @@ > </el-pagination> </div> </el-tab-pane> </el-tab-pane> --> <!-- --> <el-tab-pane name="third" label="é çç©æ"> <!-- <el-tab-pane name="third" label="é çç©æ"> <div class="task-reserve-warehouse-header"> <div> <el-divider class="pane-divider" direction="vertical"></el-divider @@ -859,7 +875,7 @@ <span>{{ scope.row.partName }}</span> </template> </el-table-column> <!-- <el-table-column label="IFSæ¹æ¬¡å·" prop="ifsBatchNo" align="center">--> <el-table-column label="IFSæ¹æ¬¡å·" prop="ifsBatchNo" align="center">--> <!-- <template slot="header" slot-scope="scope">--> <!-- <div style="line-height: 14px;">IFSæ¹æ¬¡å·</div>--> <!-- <div class="th" @click.stop>--> @@ -876,7 +892,7 @@ <!-- <template slot-scope="scope">--> <!-- <span>{{ scope.row.ifsBatchNo }}</span>--> <!-- </template>--> <!-- </el-table-column>--> <!-- </el-table-column> <el-table-column label="SNå·" prop="partBatchNo" align="center"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">SNå·</div> @@ -1000,9 +1016,9 @@ </template> </el-table-column> </el-table> </el-tab-pane> </el-tab-pane> --> <el-tab-pane name="four" label="ERPç©æ"> <!-- <el-tab-pane name="four" label="ERPç©æ"> <div class="task-reserve-warehouse-header"> <div> <el-divider class="pane-divider" direction="vertical"></el-divider @@ -1106,7 +1122,7 @@ </template> </el-table-column> </el-table> </el-tab-pane> </el-tab-pane> --> </el-tabs> <div class="workstation-house-header"> <div> @@ -1114,6 +1130,18 @@ ><span style="font-size:14px;font-weight:bold">å·²æå ¥æªæ¶èç©æ</span> </div> <div> <el-button class="return-btn" type="primary" @click="submitIns()" >æ¥æ£</el-button > <el-button class="return-btn" type="primary" @click="inputHandle()" >å°¾æå¤ç</el-button > <el-button class="return-btn" type="primary" @@ -1174,7 +1202,7 @@ :show-overflow-tooltip="true" > <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">é¶ä»¶</div> <div style="line-height: 14px;">é¶ä»¶æè¿°</div> <div class="th" @click.stop> <el-input type="text" @@ -1208,7 +1236,25 @@ <span>{{ scope.row.ifsBatchNo }}</span> </template> </el-table-column> <el-table-column label="SNå·" prop="partBatchNo" align="center"> <el-table-column label="WDRå·" prop="ifsWdr" align="center"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">WDRå·</div> <div class="th" @click.stop> <el-input type="text" v-model="queryParamThree.ifsWdr" @keyup.enter.native="handleFeedList" clearable @clear="handleFeedList" size="mini" ></el-input> </div> </template> <template slot-scope="scope"> <span>{{ scope.row.ifsWdr }}</span> </template> </el-table-column> <!-- <el-table-column label="SNå·" prop="partBatchNo" align="center"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">SNå·</div> <div class="th" @click.stop> @@ -1271,7 +1317,7 @@ <template slot-scope="scope"> <span>{{ scope.row.specs }}</span> </template> </el-table-column> </el-table-column> --> <el-table-column label="å¯ç¨æ°é" prop="availableStockQuantity" @@ -1312,13 +1358,13 @@ <span>{{ scope.row.stockQuantity }}</span> </template> </el-table-column> <el-table-column label="åºä½å·" prop="locNo" align="center"> <el-table-column label="åºä½å·" prop="ifsLocation" align="center"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">åºä½å·</div> <div class="th" @click.stop> <el-input type="text" v-model="queryParamThree.locNo" v-model="queryParamThree.ifsLocation" @keyup.enter.native="handleFeedList" clearable @clear="handleFeedList" @@ -1327,7 +1373,7 @@ </div> </template> <template slot-scope="scope"> <span>{{ scope.row.locNo }}</span> <span>{{ scope.row.ifsLocation }}</span> </template> </el-table-column> <el-table-column label="åä½" prop="unit" align="center"> @@ -1348,7 +1394,7 @@ <span>{{ scope.row.unit }}</span> </template> </el-table-column> <el-table-column label="ææ人" prop="createUser" align="center"> <!-- <el-table-column label="ææ人" prop="createUser" align="center"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">ææ人</div> <div class="th" @click.stop> @@ -1365,8 +1411,8 @@ <template slot-scope="scope"> <span>{{ scope.row.createUser }}</span> </template> </el-table-column> <el-table-column </el-table-column> --> <!-- <el-table-column label="æææ¶é´" prop="createTime" align="center" @@ -1394,7 +1440,7 @@ <template slot-scope="scope"> <span>{{ scope.row.createTime }}</span> </template> </el-table-column> </el-table-column> --> </el-table> <feedFormDialog :currshowlist.sync="showFeedForm" @@ -1441,7 +1487,7 @@ </template> <script> import { getStock, getFeed, getTodoStock } from '@/api/product/personboard' import { getStock, getFeed, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard' import { getMaterial } from '@/api/plan/operationtask' import { getERPStockListByPart, @@ -1556,9 +1602,9 @@ .then((response) => { var data = response.data if (data.code === 0) { // const list = data.data.records this.stockList = data.data.records this.queryReport.total = data.data.total /* this.stockList = data.data.records this.queryReport.total = data.data.total */ this.stockList = data.data // this.getReportData() } else { this.$message.error('è·å线边ä»ä¿¡æ¯å¤±è´¥') @@ -1850,6 +1896,57 @@ this.$message.warning('请éæ©ææé¶ä»¶') } }, // æ¥æ£ submitIns(){ if (this.selectFeeds.length > 0) { var list = [] this.selectFeeds.forEach(a=>{ list.push({ partNo: a.partNo, partDesc: a.partName, qtyToInspect: a.availableStockQuantity, partId: a.partId, waivDevRejNo: a.ifsWdr, targetQualifiedLocationId: a.locationId, workstationId: a.workstationId, taskId: this.currOperateTask.id, locationNo: a.ifsLocation, lotBatchNo: a.ifsBatchNo, qtyArrived: a.stockQuantity, waivDevRejNo: a.ifsWdr, serialNo: a.serialNo, operationId: this.currOperateTask.operationId, stockId: a.id, engChgLevel: a.engChgLevel, activitySeq: a.activitySeq }) }) submitInsPart(list).then(res=>{ this.$message.success('æ¥æ£å®æ') }) }else{ this.$message.warning('请éæ©æ¥æ£é¶ä»¶') } }, inputHandle(){ console.log(this.currOperateTask); if (this.selectFeeds.length > 0) { var list = [] this.selectFeeds.forEach(a=>{ list.push({ taskId: this.currOperateTask.id, stockId: a.id, }) }) this.$confirm("æ¤æä½å°ä¼ææéç©æå¹³å计ç®å°æææ¥å·¥åçæå ¥é").then(()=>{ inputHandle(list).then(res=>{ this.$message.success('å¤çå®æ') }) }).catch(e=>{}) } else { this.$message.warning('请éæ©å°¾æå¤ççç©æ') } }, // åå§å页é¢åé initFeed() { this.selectStocks = [] src/views/product/workbench/handymantype.vue
@@ -224,6 +224,7 @@ workstationId: { handler: function(newVal, oldVal) { if (this.workstationId) { console.log(`output->this.workstationId`,this.workstationId) getAllHandymanTemplate( Object.assign({ workstationId: this.workstationId }) ).then((response) => { src/views/product/workbench/index.vue
@@ -49,22 +49,22 @@ <el-image src="/img/workbench/icon_bg.png"></el-image> <span class="item-name">æ¥å·¥</span> </div> <div <!-- <div v-show="isShowStepBusiness" :class="['wb-header-menu-item', stepShow ? 'item-show' : '']" @click="selectItem('step')" > <el-image src="/img/workbench/icon_gb.png"></el-image> <span class="item-name">å·¥æ¥</span> </div> <div </div> --> <!-- <div v-show="permissions.product_menu_split" :class="['wb-header-menu-item', splitTaskShow ? 'item-show' : '']" @click="selectItem('splitTask')" > <el-image src="/img/workbench/icon_sp.png"></el-image> <span class="item-name">åå²</span> </div> </div> --> <div :class="['wb-header-menu-item', artificialShow ? 'item-show' : '']" @click="selectItem('artificial')" @@ -314,11 +314,11 @@ </div> <div style="float:right;width:10%;"> <div class="open-edit-duty-div"> <div> <!-- <div> <span class="duty-edit-span" @click="clearDutyRecord" >æ¸ ç©º</span > </div> </div> --> <div> <span class="duty-edit-span" @click="openDutyEdit" >ç¼è¾</span @@ -378,15 +378,24 @@ <el-tooltip class="item" effect="dark" content="æ¹éæ交" content="æ¸ ç©º" placement="top" > <button <!-- <button class="duty-circle-button" @click="submitSaveDutyRecord" > <i class="el-icon-document-checked" class="el-icon-delete" style="color: #FFFFFF;" ></i> </button> --> <button class="duty-circle-button" @click="clearDutyRecord" > <i class="el-icon-delete" style="color: #FFFFFF;" ></i> </button> @@ -464,7 +473,7 @@ :inline="true" style="margin-left: 10px" > <el-form-item prop="orderNumber" label="éå®è®¢åå·"> <!-- <el-form-item prop="orderNumber" label="éå®è®¢åå·"> <el-input placeholder="请è¾å ¥éå®è®¢åå·" v-model="operateTaskForm.orderNumber" @@ -472,8 +481,8 @@ @keyup.enter.native="queryInfoForOrderNumber" @clear="queryInfoForOrderNumber" ></el-input> </el-form-item> <el-form-item prop="spec" label="æåè§æ ¼"> </el-form-item> --> <!-- <el-form-item prop="spec" label="æåè§æ ¼"> <el-select placeholder="请éæ©æåè§æ ¼" v-model="operateTaskForm.spec" @@ -498,19 +507,19 @@ > </el-option> </el-select> </el-form-item> <el-form-item prop="outBatchNo" label="SN"> </el-form-item> --> <el-form-item prop="outBatchNo" label="车é´è®¢å"> <el-input placeholder="请è¾å ¥æå ¥åæåSNå·" placeholder="请è¾å ¥è½¦é´è®¢åå·" v-model="operateTaskForm.outBatchNo" clearable @keyup.enter.native="refreshOperateTasksByConditions" @clear="refreshOperateTasksByConditions" ></el-input> </el-form-item> <el-form-item prop="mpsNo" label="计åå·"> <el-form-item prop="mpsNo" label="å·¥åå·"> <el-input placeholder="请è¾å ¥è®¡åå·" placeholder="请è¾å ¥å·¥åå·" v-model="operateTaskForm.mpsNo" clearable @keyup.enter.native="refreshOperateTasksByConditions" @@ -1424,7 +1433,7 @@ .task-div-content { // height: calc(100% - 40px); flex: 1; padding: 0px 15px; padding: 10px 15px; box-sizing: border-box; overflow-y: auto; margin-bottom: 10px; @@ -1661,7 +1670,7 @@ ...mapGetters(['userInfo', 'tagWel', 'permissions']) }, created() { document.title = 'å·¥ä½å°ââZTTMES' document.title = 'å·¥ä½å°ââMES' if (!this.dutyForm.workstationId) { const k = localStorage.getItem(storage_key) if (k) { @@ -1672,7 +1681,6 @@ this.getSysParam(sysParam.SHOW_STEP_BUSINESS) this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE) this.timer = setInterval(this.clockTimer, 1000) console.log(this.permissions, 'ASSS') }, watch: { 'dutyForm.workstationId'(val) { @@ -2250,9 +2258,9 @@ if (!this.dutyForm.endTime) { return { result: false, msg: 'ç»ææ¶é´ä¸è½ä¸ºç©º' } } if (!this.dutyForm.dutyTime) { /* if (!this.dutyForm.dutyTime) { return { result: false, msg: 'ç次æ¶é´ä¸è½ä¸ºç©º' } } } */ if (!this.dutyForm.shiftId) { return { result: false, msg: 'ç次ä¸è½ä¸ºç©º' } } src/views/product/workbench/operation-task-pane.vue
@@ -17,7 +17,7 @@ <img class="selectedImg" src="/img/workbench/icon_selected.png" /> <div class="header"> <div>å·¥åå·ï¼{{ item.taskNo }}</div> <div>计åå·ï¼{{ item.mpsNo }}</div> <!-- <div>计åå·ï¼{{ item.mpsNo }}</div> --> <div :class="[ 'status-change-div', @@ -52,10 +52,10 @@ <div class="l">é¶ä»¶å·ï¼</div> <div class="r">{{ item.partNo }}</div> </div> <div class="row"> <!-- <div class="row"> <div class="l">æåï¼</div> <div class="r">{{ item.productName }}</div> </div> </div> --> <div class="row"> <div class="l">计åå®ææ¶é´ï¼</div> <div class="r">{{ item.planFinishDay }}</div> @@ -250,7 +250,7 @@ </style> <script> import { getOperationTask, getOperationTaskCopy, changeBackState, changeOperationTaskState, getDraftProductOut, @@ -579,7 +579,7 @@ if (this.mpsNo && this.mpsNo != null) { query.mpsNo = this.mpsNo } getOperationTask(query) getOperationTaskCopy(query) .then((response) => { var data = response.data if (data.code === 0) { src/views/product/workbench/product-record-form.vue
@@ -10,7 +10,7 @@ > <div class="product-record-form-header"> <div> <span>ç产模æ¿</span> <span>è®°å½æ¨¡æ¿ï¼</span> <el-select v-model="selectedTemplateId" placeholder="ç产记å½æ¨¡æ¿" @@ -63,7 +63,7 @@ </div> </div> </div> <div class="product-record-form-header"> <!-- <div class="product-record-form-header"> <div> <span>åå²æ¨¡æ¿</span> <el-select @@ -117,9 +117,9 @@ </el-input> </div> </div> </div> </div> --> <div class="table"> <div class="table-sn"> <!-- <div class="table-sn"> <el-table :data="outputPartsList" :border="true"> <el-table-column label="åºå·" type="index"></el-table-column> <el-table-column label="SNå·"> @@ -138,7 +138,7 @@ </template> </el-table-column> </el-table> </div> </div> --> <div class="table-product"> <el-table ref="productRecordFormTable" @@ -219,7 +219,7 @@ flex: 0.35; } .table-product { flex: 0.6; flex: 1; } } .product-record-form-table >>> .stripe-row { src/views/product/workbench/productoutput-table.vue
@@ -1,25 +1,14 @@ <template> <div class="productoutput-div" style="padding:0px 14px;height: 100%;overflow: auto;" > <div class="productoutput-div" style="padding:0px 14px;height: 100%;overflow: auto;"> <div class="product-output-header"> <div style="height:28px;line-height:28px;"> <el-divider class="pane-divider" direction="vertical"></el-divider ><span style="font-size:14px;font-weight:bold">产åºè®°å½å表</span> <el-divider class="pane-divider" direction="vertical"></el-divider><span style="font-size:14px;font-weight:bold">产åºè®°å½å表</span> </div> </div> <ttable :table="table" @handleSelectionChange="handleSelectionChange" @currentChange="handleCurrentChange" :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="productOutputForCheckTable" > <ttable :table="table" @handleSelectionChange="handleSelectionChange" @currentChange="handleCurrentChange" :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="productOutputForCheckTable"> <template #toolbar></template> </ttable> @@ -177,12 +166,27 @@ </el-col> </el-row> --> <!-- å¼¹çª, æå¨æ¥æ£ --> <qualityTestApplyForm v-if="qualityTestApplyVisible" ref="qualityTestApply" @refreshDataList="getData" :applyPartList="multipleSelection" /> <el-dialog title="åæææå ¥" :visible.sync="dialogVisible" width="40%"> <el-table :data="tableData" style="width: 100%;" height="30em" border empty-text="ææ æ°æ®"> <el-table-column label="åºå·" type="index"></el-table-column> <el-table-column prop="partNo" label="é¶ä»¶ç¼å·" width="180"> </el-table-column> <el-table-column prop="partName" label="é¶ä»¶å称" :show-overflow-tooltip="true" width="180"> </el-table-column> <el-table-column prop="unit" label="åä½" min-width="60"></el-table-column> <el-table-column prop="inputQuantity" label="使ç¨æ°é"> <template v-slot="scope"> <el-input v-model="scope.row.inputQuantity"></el-input> </template> </el-table-column> </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="dialogVisible = false">å æ¶</el-button> <el-button type="primary" @click="rawMaterialApiUpdate">ç¡® å®</el-button> </span> </el-dialog> <qualityTestApplyForm v-if="qualityTestApplyVisible" ref="qualityTestApply" @refreshDataList="getData" :applyPartList="multipleSelection" /> </div> </template> <style lang="scss" scoped> @@ -193,10 +197,12 @@ justify-content: space-between; align-items: center; } .pane-divider { width: 4px; background-color: #4283ee; } .productoutput-div >>> .inspection-btn { background-image: -webkit-linear-gradient(139deg, #5f6eef 0%, #2783ff 100%); background-image: -moz-linear-gradient(139deg, #5f6eef 0%, #2783ff 100%); @@ -206,14 +212,17 @@ border-radius: 15px; padding: 6px 15px; } .productoutput-div >>> .inspection-btn span { margin-left: 3px; } .productoutput-div >>> .commonTable .el-table__header th { background: #599ef4 !important; color: #fff !important; border: 0px !important; } .productoutput-div >>> .feed-btn-return { background: url('/img/workbench/icon_bj.png') center center no-repeat; background-size: cover; @@ -225,6 +234,7 @@ font-size: 14px; visibility: hidden; } .productoutput-div >>> .common-table-div { margin: 0px 20px 0px !important; } @@ -238,6 +248,7 @@ border-radius: 15px; padding: 6px 15px; } .auto-judgment-btn >>> span { margin-left: 3px; } @@ -252,7 +263,9 @@ saveSelfSampleItem, getReportSampleForSelf, putReportSampleItem, autoJudgmentSelf autoJudgmentSelf, rawMaterialApi, rawMaterialApiUpdate } from '@/api/quality/report' import ttable from '@/views/common/ztt-table' import qualityTestApplyForm from './qualitytestapply-form' @@ -275,6 +288,7 @@ }, data() { return { tableData: [], paramObj: { workstationId: 0 }, ajaxFun: fetchOutputList, addOrUpdateVisible: false, @@ -317,7 +331,7 @@ isSearch: true, searchInfoType: 'text' }, { /* { minWidth: '160', prop: 'systemNo', label: 'ç³»ç»ç¼å·', @@ -334,11 +348,11 @@ isTrue: true, isSearch: true, searchInfoType: 'text' }, }, */ { minWidth: '160', prop: 'outBatchNo', label: 'SNå·', label: 'åºåå·', sort: true, isTrue: true, isSearch: true, @@ -371,7 +385,11 @@ isSearch: true, searchInfoType: 'text', formatter: (row, column, cellValue) => { return cellValue.substring(1, cellValue.length - 2) try{ return cellValue.substring(1, cellValue.length - 1) }catch(e){ return null } } }, { @@ -392,7 +410,7 @@ isSearch: true, searchInfoType: 'datetimerange' }, { /* { minWidth: '160', prop: 'startMeterMark', label: 'èµ·å§ç±³æ ', @@ -409,7 +427,7 @@ isTrue: true, isSearch: true, searchInfoType: 'text' }, }, */ { minWidth: '100', prop: 'productQty', @@ -538,7 +556,22 @@ // icon: 'feed-btn-return', // fun: this.qualityApply // } ] ], /* operator: [ { text: 'æå ¥', icon: 'el-icon-circle-plus-outline', type: 'text', size: 'small', fun: this.showHandleDiago } ], operatorConfig: { fixed: 'right', label: 'æä½', width: 100, minWidth: 100 } */ }, booleanOptions: [ { value: true, label: 'æ¯' }, @@ -565,7 +598,8 @@ isMoTestStandard: true, testStandardNo: '', reportSampleItemList: [] } }, dialogVisible: false } }, components: { @@ -639,6 +673,23 @@ this.createdData() }, methods: { rawMaterialApiUpdate() { rawMaterialApiUpdate(this.tableData).then(res => { this.$message.success('åæææå ¥ä¿®æ¹æå') this.dialogVisible = false; }) }, showHandleDiago(row) { this.dialogVisible = true this.tableData = [] rawMaterialApi(row.id).then(res => { if(res.data.data[0] == null){ this.tableData = [] } else { this.tableData = res.data.data } }) }, // è·åæ°æ®å表 getData() { this.$refs.productOutputForCheckTable.getDataList() @@ -656,7 +707,6 @@ }) }, handleSelectionChange(val) { console.log(val, 'ASSSS') this.multipleSelection = val }, handleCurrentChange(val) { src/views/product/workbench/returnmaterial-form.vue
@@ -32,18 +32,18 @@ > </el-table-column> <el-table-column prop="partBatchNo" prop="ifsBatchNo" header-align="center" align="center" label="é¶ä»¶æ¹å·" label="æ¹å·" > </el-table-column> <el-table-column <!-- <el-table-column prop="specs" header-align="center" align="center" label="è§æ ¼åå·" > > --> </el-table-column> <el-table-column prop="returnQuantity" @@ -162,6 +162,8 @@ feed.returnQuantity = this.dataList[i].returnQuantity feed.returnLocationId = this.dataList[i].returnLocationId feed.workstationId = this.workstationId feed.ifsWdr = this.dataList[i].ifsWdr feed.partNo = this.dataList[i].partNo feeds.push(feed) } if (feeds.length > 0) { src/views/product/workbench/taskinfo-pane.vue
@@ -2,39 +2,25 @@ <div ref="taskInfoDiv" class="taskinfo-div"> <div class="need-feed-header"> <div style="height:28px;line-height:28px;"> <el-divider class="pane-divider" direction="vertical"></el-divider ><span style="font-size:14px;font-weight:bold">å·¥å详ç»ä¿¡æ¯</span> <div style="display: inline-block;vertical-align: middle;margin-left:2px;cursor: pointer;" @click="shrinkExpandTaskInfo" > <i :class="[ <el-divider class="pane-divider" direction="vertical"></el-divider><span style="font-size:14px;font-weight:bold">å·¥å详ç»ä¿¡æ¯</span> <div style="display: inline-block;vertical-align: middle;margin-left:2px;cursor: pointer;" @click="shrinkExpandTaskInfo"> <i :class="[ 'taskinfo-header', 'el-icon-arrow-right', taskInfoShow ? 'is-active' : '' ]" ></i> ]"></i> </div> </div> </div> <div ref="taskInfoMainDiv" class="taskinfo-main" :style="{ height: taskInfoMainHeight }" v-show="taskInfoShow" > <el-tabs v-model="taskInfoActiveName" type="card" class="taskInfoMainTab" @tab-click="handleClick" > <div ref="taskInfoMainDiv" class="taskinfo-main" :style="{ height: taskInfoMainHeight }" v-show="taskInfoShow"> <el-tabs v-model="taskInfoActiveName" type="card" class="taskInfoMainTab" @tab-click="handleClick"> <el-tab-pane label="主è¦ä¿¡æ¯" name="主è¦ä¿¡æ¯"> <el-row> <el-col :span="10" :offset="1" class="taskinfo-pane-div"> <el-row> <el-col :span="12"> <!-- <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>éå®è®¢åå·</label> @@ -53,7 +39,7 @@ </div> </div> </div> </el-col> </el-col> --> <el-col :span="12"> <div class="param-top"> <div class="form-item"> @@ -64,12 +50,22 @@ </div> </div> </el-col> <el-col :span="12" ><div class="param-top"> <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>å·¥åº</label> <div style="color: #7A9EFD"> {{ currOperateTask.operationName }} </div> </div> </div> </el-col> <el-col :span="24"> <div class="param-top"> <div class="form-item"> <label>é¶ä»¶å称</label> <div style="color: #7A9EFD"> {{ currOperateTask.partName }} </div> </div> </div> @@ -91,16 +87,6 @@ <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>é¶ä»¶å称</label> <div style="color: #7A9EFD"> {{ currOperateTask.partName }} </div> </div> </div> </el-col> <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>æåè§æ ¼</label> <div style="color: #7A9EFD"> {{ currOperateTask.productName }} @@ -108,7 +94,7 @@ </div> </div> </el-col> <el-col :span="12"> <!-- <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>è½½å ·è§æ ¼</label> @@ -117,7 +103,7 @@ </div> </div> </div> </el-col> </el-col> --> </el-row> </el-col> </el-row> @@ -147,7 +133,7 @@ </div> </el-col> <el-col :span="12"> <!-- <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>çé¿</label> @@ -164,6 +150,16 @@ ? 0 : currOperateTask.discNum }}ç </div> </div> </div> </el-col> --> <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>å®é å¼å§æ¶é´</label> <div style="color: #7A9EFD"> {{ currOperateTask.actualStartDate }} </div> </div> </div> @@ -192,7 +188,6 @@ </div> </div> </el-col> <el-col :span="12"> <div class="param-top"> <div class="form-item"> @@ -203,17 +198,7 @@ </div> </div> </el-col> <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>å®é å¼å§æ¶é´</label> <div style="color: #7A9EFD"> {{ currOperateTask.actualStartDate }} </div> </div> </div> </el-col> <el-col :span="12"> <!-- <el-col :span="12"> <div class="param-top"> <div class="form-item"> <label>客æ·å称</label> @@ -222,7 +207,7 @@ </div> </div> </div> </el-col> </el-col> --> </el-row> </el-col> </el-row> @@ -232,75 +217,37 @@ <el-tree :data="batchTree" node-key="id"> </el-tree> </div> </el-tab-pane>--> <el-tab-pane label="ææ¹æ¬¡æ¥å·¥" name="ææ¹æ¬¡æ¥å·¥"> <!-- <el-tab-pane label="ææ¹æ¬¡æ¥å·¥" name="ææ¹æ¬¡æ¥å·¥"> <div> <ctable class="task-detail-info-table" :table="taskDetailInfoTable" <ctable class="task-detail-info-table" :table="taskDetailInfoTable" @handleSelectionChange="taskDetailInfoHandleSelectionChange" @objectSpanMethod="objectSpanMethodForTaskDetailInfo(arguments)" :mergeCols="detailInfoMergeCols" :searchList="taskDetailInfoSearchList" :uploadInfo="taskDetailInfoUploadInfo" :prelang="taskDetailInfoPrelang" :options="taskDetailInfoOptions" :paramObj="taskDetailInfoParamObj" :isShowPagination="isShowPagination" :bottomOffset="65" :ajaxFun="taskDetailInfoAjaxFun" ref="segmentmergeTaskDetailInfoTable" > @objectSpanMethod="objectSpanMethodForTaskDetailInfo(arguments)" :mergeCols="detailInfoMergeCols" :searchList="taskDetailInfoSearchList" :uploadInfo="taskDetailInfoUploadInfo" :prelang="taskDetailInfoPrelang" :options="taskDetailInfoOptions" :paramObj="taskDetailInfoParamObj" :isShowPagination="isShowPagination" :bottomOffset="65" :ajaxFun="taskDetailInfoAjaxFun" ref="segmentmergeTaskDetailInfoTable"> <template #toolbar> <div style="display:flex;"> <div style="display:flex;margin-left:5px ;"> <el-button style="height:32px;" @click="beginEdit()" type="primary" v-show="isEditShow" >ç¼è¾ <el-button style="height:32px;" @click="beginEdit()" type="primary" v-show="isEditShow">ç¼è¾ </el-button> </div> <div style="display:flex;margin-left:5px ;"> <el-button style="height:32px;" @click="cancelEdit()" type="primary" v-show="!isEditShow" >åæ¶ <el-button style="height:32px;" @click="cancelEdit()" type="primary" v-show="!isEditShow">åæ¶ </el-button> </div> <div style="display:flex;margin-left:10px ;"> <el-button style="height:32px;" @click="saveEdit()" type="primary" v-show="!isEditShow" >ä¿å <el-button style="height:32px;" @click="saveEdit()" type="primary" v-show="!isEditShow">ä¿å </el-button> </div> <div style="display:flex;margin-left:5px ;"> <div style="font-weight:bold;font-size:15px;line-height:28px;margin-right:5px;" > <div style="font-weight:bold;font-size:15px;line-height:28px;margin-right:5px;"> å·¥åºéæ© </div> <div style="display:flex;"> <el-select v-model="selectedOperationIds" placeholder="请éæ©" multiple clearable size="mini" class="segmentmerge-operation-select" @change="setQueryObj" > <el-option v-for="item in operationList" :key="item.id" :label="item.name" :value="item.id" > <el-select v-model="selectedOperationIds" placeholder="请éæ©" multiple clearable size="mini" class="segmentmerge-operation-select" @change="setQueryObj"> <el-option v-for="item in operationList" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </div> @@ -309,57 +256,32 @@ </template> </ctable> </div> </el-tab-pane> </el-tab-pane> --> </el-tabs> </div> <div ref="taskInfoBodyDiv" class="taskinfo-body" :style="{ height: taskInfoBodyHeight }" > <div ref="taskInfoBodyDiv" class="taskinfo-body" :style="{ height: taskInfoBodyHeight }"> <div style="display:flex;justify-content:space-between;height:100%;"> <div style="height:100%;width:70%;"> <!-- <div v-if="paramTabs.length == 0" class="taskinfo-body-div">--> <!-- ä¸åå¨ç»å®çå·¥èºå¡åé çå--> <!-- </div>--> <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick"> <el-tab-pane v-for="(paramTab, index) in paramTabs" :key="index" :label="paramTab" :name="paramTab" > <el-tab-pane v-for="(paramTab, index) in paramTabs" :key="index" :label="paramTab" :name="paramTab"> <div class="pane-div"> <div> <el-divider class="pane-divider" direction="vertical" ></el-divider ><span style="font-size:14px;font-weight:bold">åæ°é</span> <el-divider class="pane-divider" direction="vertical"></el-divider><span style="font-size:14px;font-weight:bold">åæ°é</span> <div class="template-content-div"> <el-select v-model="currTemplateId" placeholder="请éæ©" style="width: 300px;" @change="tabParamsClick()" clearable > <el-option v-for="item in everyTabParams" :key="item.id" :label="item.operationTemplateName" :value="item.id" > <el-select v-model="currTemplateId" placeholder="请éæ©" style="width: 300px;" @change="tabParamsClick()" clearable> <el-option v-for="item in everyTabParams" :key="item.id" :label="item.operationTemplateName" :value="item.id"> <div style="display: table;width: 300px;"> <div style="display: table-row;"> <div style="display: table-cell;width:50%;text-align: center;" > <div style="display: table-cell;width:50%;text-align: center;"> {{ item.systemNo }} </div> <div style="display: table-cell;text-align: center;" > <div style="display: table-cell;text-align: center;"> {{ item.operationTemplateName }} </div> </div> @@ -430,45 +352,21 @@ </div> </div> <div style="margin-top:14px;"> <el-divider class="pane-divider" direction="vertical" ></el-divider ><span style="font-size:14px;font-weight:bold">åæ°</span> <el-divider class="pane-divider" direction="vertical"></el-divider><span style="font-size:14px;font-weight:bold">åæ°</span> <div class="params-content-div"> <el-table :data="params" :height="tableHeight" :header-cell-style="paramsTableHeaderStyle" :row-class-name="tableRowClassName" class="taskinfo-params-table" > <el-table-column prop="code" label="ç¼å·" width="200" align="center" > <el-table :data="params" :height="tableHeight" :header-cell-style="paramsTableHeaderStyle" :row-class-name="tableRowClassName" class="taskinfo-params-table"> <el-table-column prop="code" label="ç¼å·" width="200" align="center"> </el-table-column> <el-table-column prop="parameterItem" label="å称" width="200" align="center" > <el-table-column prop="parameterItem" label="å称" width="200" align="center"> <template slot-scope="scope"> <span >{{ scope.row.parameterItem }}ï¼{{ <span>{{ scope.row.parameterItem }}ï¼{{ scope.row.unit }}ï¼</span > }}ï¼</span> </template> </el-table-column> <el-table-column prop="paramValue" label="å¼" align="center" > <el-table-column prop="paramValue" label="å¼" align="center"> </el-table-column> </el-table> </div> @@ -482,7 +380,7 @@ </div> </el-tab-pane> <!--å·¥èºé ç½®å--> <el-tab-pane :label="tabNameExt0" :name="tabNameExt0" class="l-mes"> <!-- <el-tab-pane :label="tabNameExt0" :name="tabNameExt0" class="l-mes"> --> <!-- <div style="margin-left: 40px"> <el-radio v-model="configContent.modelType" label="01" disabled >模æ¿1</el-radio @@ -491,91 +389,44 @@ >模æ¿2</el-radio > </div> --> <el-divider content-position="left">é ç½®åå 容</el-divider> <!-- <el-divider content-position="left">é ç½®åå 容</el-divider> --> <!--模æ¿1--> <div class="node-content-remark" v-if="configContent.modelType === '01'" > <el-form class="configform1" :inline="true" ref="form" label-width="80px" > <!-- <div class="node-content-remark" v-if="configContent.modelType === '01'"> <el-form class="configform1" :inline="true" ref="form" label-width="80px"> <el-form-item label="订åç¼å·ï¼"> <el-input v-model="configContent.proNo" readonly></el-input> </el-form-item> <el-form-item label="项ç®å称ï¼"> <el-input v-model="configContent.proName" readonly ></el-input> <el-input v-model="configContent.proName" readonly></el-input> </el-form-item> <el-form-item label="ç产è¦æ±æè¿°ï¼" style="width: 100%" label-width="105px" > <el-form-item label="ç产è¦æ±æè¿°ï¼" style="width: 100%" label-width="105px"> <div class="ql-editor" v-html="configContent.remark1" /> </el-form-item> </el-form> </el-form> --> <!-- ç产è¦æ±æè¿°ï¼--> </div> <!-- </div> --> <!--模æ¿2--> <div class="node-content-remark2" v-if="configContent.modelType === '02'" > <div class="node-content-remark2" style="width: 90%;margin-left: 30px;" > <el-form class="configform2" :inline="true" ref="form" label-width="80px" > <!-- <div class="node-content-remark2" v-if="configContent.modelType === '02'"> <div class="node-content-remark2" style="width: 90%;margin-left: 30px;"> <el-form class="configform2" :inline="true" ref="form" label-width="80px"> <el-form-item label="ååç¼å·ï¼" style="width: 40%"> <el-input v-model="configContent.proNo" readonly ></el-input> <el-input v-model="configContent.proNo" readonly></el-input> </el-form-item> <el-form-item label="项ç®å称ï¼" style="width: 40%"> <el-input v-model="configContent.proName" readonly ></el-input> <el-input v-model="configContent.proName" readonly></el-input> </el-form-item> <el-form-item label="å°åè¦æ±ï¼" style="width: 100%"> <el-input v-model="configContent.printReq" readonly ></el-input> <el-input v-model="configContent.printReq" readonly></el-input> </el-form-item> <el-form-item label="ç产è§æ ¼åå·åæ°éï¼" style="width: 100%" label-width="140px" > <el-form-item label="ç产è§æ ¼åå·åæ°éï¼" style="width: 100%" label-width="140px"> <div class="ql-editor" v-html="configContent.remark1" /> </el-form-item> <el-form-item label="ç产è¦æ±æè¿°ï¼" style="width: 100%" label-width="105px" > <el-form-item label="ç产è¦æ±æè¿°ï¼" style="width: 100%" label-width="105px"> <div class="ql-editor" v-html="configContent.remark2" /> </el-form-item> <el-form-item label="å®é å°åè¦æ±ï¼" style="width: 80%" label-width="105px" > <el-form-item label="å®é å°åè¦æ±ï¼" style="width: 80%" label-width="105px"> <el-input v-model="configContent.realPrintReq"></el-input> </el-form-item> <el-row class="bodyrow"> @@ -584,9 +435,7 @@ <div class="form-item" style="text-align: left"> <label>å泡ç¼è¯(Φmm)</label> <div style="color: #7A9EFD"> <el-input v-model="configContent.cableCore" ></el-input> <el-input v-model="configContent.cableCore"></el-input> </div> </div> </div> @@ -603,9 +452,7 @@ <div class="form-item"> <label>模è¯(Φmm)</label> <div style="color: #7A9EFD"> <el-input v-model="configContent.modelCore" ></el-input> <el-input v-model="configContent.modelCore"></el-input> </div> </div> </div> @@ -615,33 +462,27 @@ <div class="form-item"> <label>模å¥(Φmm)</label> <div style="color: #7A9EFD"> <el-input v-model="configContent.modelSleeve" ></el-input> <el-input v-model="configContent.modelSleeve"></el-input> </div> </div> </div> </el-col> <el-col :span="3" ><div class="param-top"> <el-col :span="3"> <div class="param-top"> <div class="form-item"> <label>å®å¾æ¨¡(Φmm)</label> <div style="color: #7A9EFD"> <el-input v-model="configContent.sizingModel" ></el-input> <el-input v-model="configContent.sizingModel"></el-input> </div> </div> </div> </el-col> <el-col :span="3" ><div class="param-top"> <el-col :span="3"> <div class="param-top"> <div class="form-item"> <label>è¿æ¨¡(Φmm)</label> <div style="color: #7A9EFD"> <el-input v-model="configContent.strandModel" ></el-input> <el-input v-model="configContent.strandModel"></el-input> </div> </div> </div> @@ -651,153 +492,72 @@ 产åçæ§è½è¦æ±ï¼20âæ¶ççµæ°ç¹å¾ </div> <el-table :data="configContent.processConfigDataList" style="width: 100%;margin-top: 10px" border > <el-table :data="configContent.processConfigDataList" style="width: 100%;margin-top: 10px" border> <el-table-column prop="date" label="é¢ç(MHz)"> <template slot-scope="scope"> <el-input v-model="scope.row.frequency" disabled ></el-input> <el-input v-model="scope.row.frequency" disabled></el-input> </template> </el-table-column> <el-table-column prop="name" label="æå¤§ä¼ éè¡°å(dB/km)"> <template slot-scope="scope"> <el-input v-model="scope.row.deliveryReduce" disabled ></el-input> <el-input v-model="scope.row.deliveryReduce" disabled></el-input> </template> </el-table-column> <el-table-column prop="province" label="è¦åæèmax(dB),2ç±³,95%" > <el-table-column prop="province" label="è¦åæèmax(dB),2ç±³,95%"> <template slot-scope="scope"> <el-input v-model="scope.row.couplingLoss" disabled ></el-input> <el-input v-model="scope.row.couplingLoss" disabled></el-input> </template> </el-table-column> </el-table> <el-form-item label="å·¥ä½é¢å¸¦å 驻波æ¯ï¼" style="width: 80%" label-width="120px" > <el-input v-model="configContent.workFrequency" disabled ></el-input> <el-form-item label="å·¥ä½é¢å¸¦å 驻波æ¯ï¼" style="width: 80%" label-width="120px"> <el-input v-model="configContent.workFrequency" disabled></el-input> </el-form-item> <el-form-item label="é¢çèå´ï¼" style="width: 80%" label-width="120px" > <el-input v-model="configContent.frequencyRange" disabled ></el-input> <el-form-item label="é¢çèå´ï¼" style="width: 80%" label-width="120px"> <el-input v-model="configContent.frequencyRange" disabled></el-input> </el-form-item> <el-form-item label="ç´æµçµé»ï¼" style="width: 80%" label-width="120px" > <el-input v-model="configContent.resistance" disabled ></el-input> <el-form-item label="ç´æµçµé»ï¼" style="width: 80%" label-width="120px"> <el-input v-model="configContent.resistance" disabled></el-input> </el-form-item> <el-form-item label="å¤æ³¨ï¼" style="width: 100%" label-width="120px" > <el-form-item label="å¤æ³¨ï¼" style="width: 100%" label-width="120px"> <div class="ql-editor" v-html="configContent.remark4" /> </el-form-item> </el-form> </div> </div> </el-tab-pane> </el-tab-pane> --> <!--å·¥èºé件--> <el-tab-pane :label="tabNameExt1" :name="tabNameExt1"> <el-table :data="processConfigFileTableData" border style="width: 100%;" :header-cell-style="{ <!-- <el-tab-pane :label="tabNameExt1" :name="tabNameExt1"> <el-table :data="processConfigFileTableData" border style="width: 100%;" :header-cell-style="{ background: 'antiquewhite', color: '#333' }" > <el-table-column prop="orderNumber" label="订åå·" align="center" ></el-table-column> <el-table-column prop="lineNumber" label="è¡å·" align="center" ></el-table-column> <el-table-column prop="originalFileName" label="æ件å" align="center" ></el-table-column> <el-table-column prop="createUser" label="ä¸ä¼ 人" align="center" ></el-table-column> <el-table-column prop="createTime" label="ä¸ä¼ æ¶é´" align="center" ></el-table-column> }"> <el-table-column prop="orderNumber" label="订åå·" align="center"></el-table-column> <el-table-column prop="lineNumber" label="è¡å·" align="center"></el-table-column> <el-table-column prop="originalFileName" label="æ件å" align="center"></el-table-column> <el-table-column prop="createUser" label="ä¸ä¼ 人" align="center"></el-table-column> <el-table-column prop="createTime" label="ä¸ä¼ æ¶é´" align="center"></el-table-column> <el-table-column label="æä½"> <template slot-scope="scope"> <el-button @click="downloadProcessConfigFile(scope.row)" type="text" size="small" >ä¸è½½</el-button > <el-button @click="downloadProcessConfigFile(scope.row)" type="text" size="small">ä¸è½½</el-button> </template> </el-table-column> </el-table> </el-tab-pane> </el-tab-pane> --> <!--ç»æå¾--> <el-tab-pane :label="tabNameExt2" :name="tabNameExt2"> <!-- <el-tab-pane :label="tabNameExt2" :name="tabNameExt2"> <div style="text-align: center; padding: 15px 15px;"> <img width="70%" v-for="(image, index) in structureImages" :key="index" :src="image.url" alt="" /> <img width="70%" v-for="(image, index) in structureImages" :key="index" :src="image.url" alt="" /> </div> </el-tab-pane> </el-tab-pane> --> </el-tabs> </div> <div style="height:100%;width:27%;"> <div style="height: 50px;line-height:50px;"> <span style="color:#363636;font-size:16px;font-weight:700;" >å·¥èºå¤æ³¨</span > <span style="color:#363636;font-size:16px;font-weight:700;">å·¥èºå¤æ³¨</span> </div> <div style="height:calc( 100% - 50px );overflow: auto;padding:10px 10px;" > <div style="height:calc( 100% - 50px );overflow: auto;padding:10px 10px;"> <div> <span v-html="this.currOperateTask.routingOperationRemark"></span> </div> @@ -805,26 +565,13 @@ </div> </div> </div> <productOutByBatchFormDialog :currshowlist.sync="showProductByBatchForm" :productList="productList" :discToolMeasurementVal="discToolMeasurementVal" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" :groupStatus="groupStatus" :orderSnGenerateIdList="orderSnGenerateIdList" @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" /> <isReproduceFormDialog :currshowlist.sync="showIsReproduceForm" :orderSnGenerateIdList="orderSnGenerateIdList" @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" /> <processConfigurationSheetDialog :currshowlist.sync="showProcessConfigurationSheet" :orderInfo="orderInfo" /> <productOutByBatchFormDialog :currshowlist.sync="showProductByBatchForm" :productList="productList" :discToolMeasurementVal="discToolMeasurementVal" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" :groupStatus="groupStatus" :orderSnGenerateIdList="orderSnGenerateIdList" @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" /> <isReproduceFormDialog :currshowlist.sync="showIsReproduceForm" :orderSnGenerateIdList="orderSnGenerateIdList" @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" /> <processConfigurationSheetDialog :currshowlist.sync="showProcessConfigurationSheet" :orderInfo="orderInfo" /> </div> </template> <style lang="scss" scoped> @@ -834,13 +581,16 @@ justify-content: space-between; align-items: center; } .taskinfo-header.is-active { transform: rotate(90deg); } .taskinfo-header { transition: transform 0.3s; font-weight: 300; } .taskinfo-div { height: 100%; overflow: auto; @@ -848,11 +598,13 @@ /*display: flex; flex-direction: column;*/ } .taskinfo-pane-div { border: 0.5px solid #f8f8fb; border-radius: 10px; height: 120px; } .taskinfo-main { /*flex-grow: 0; flex-shrink: 0;*/ @@ -861,10 +613,12 @@ justify-content: space-between; overflow: auto; } .taskinfo-main-item { width: 33%; position: relative; } .param-top { width: 100%; height: 30px; @@ -895,6 +649,7 @@ vertical-align: text-top; } } /*.taskinfo-main-item img {*/ /* width: 100%;*/ /*}*/ @@ -904,18 +659,22 @@ margin-top: 5px; background-color: #fff; } .taskinfo-body >>> .el-tabs { height: 100%; } .taskinfo-body >>> .el-tabs__item.is-active { color: #363636; background-color: #fff; font-weight: bold; } .taskinfo-body >>> .el-tabs__item:hover { color: #363636; font-weight: bold; } .taskinfo-body >>> .el-tabs__item { background-color: #f3f8fb; min-width: 115px; @@ -923,26 +682,32 @@ font-size: 16px !important; text-align: center; } .taskinfo-body >>> .el-tabs__content { height: calc(100% - 65px); } .taskinfo-body >>> .el-tabs__content .el-tab-pane { height: 100%; overflow: auto; } .configform1 { .el-input { width: 300px; } } .configform2 { /deep/ .el-form-item__content { width: 70% !important; } .el-input { width: 100%; } } .taskinfo-body-div { text-align: center; margin: auto; @@ -950,6 +715,7 @@ color: #9ec1eb; white-space: nowrap; } .pane-div { height: 100%; padding: 5px 14px; @@ -959,16 +725,20 @@ width: 4px; background-color: #4283ee; } .template-content-div { margin-top: 14px; } .template-content-div > div:first-child img { width: 100%; } .template-listbody-div { height: calc(100% - 94px); overflow: auto; } .template-listbody-div > div { width: 100%; height: 54px; @@ -977,48 +747,57 @@ box-shadow: 0px 2px 14px 2px rgba(47, 47, 47, 0.06); border: solid 1px #f0f0f0; } .template-unchecked-div { background-color: #fff; } .template-checked-div { background-color: #6290ec; } .template-checked-systemno { color: #fffdfd; } .template-checked-templatename { color: #fffdfd; } .template-unchecked-systemno { color: #4898fc; } .template-unchecked-templatename { color: #3f3f3f; } .template-listbody-div >>> .el-checkbox.is-disabled .el-checkbox__inner { cursor: pointer; } .template-listbody-div >>> .el-checkbox.is-disabled.is-checked .el-checkbox__inner { .template-listbody-div>>>.el-checkbox.is-disabled.is-checked .el-checkbox__inner { background-color: #fff; border-color: #409eff; } .template-listbody-div >>> .el-checkbox.is-disabled.is-checked .el-checkbox__inner::after { .template-listbody-div>>>.el-checkbox.is-disabled.is-checked .el-checkbox__inner::after { border-color: #409eff; } .params-content-div { margin-top: 14px; } .el-table >>> .stripe-row { background: #eef3fd; } .params-pagination { margin-top: 5px; text-align: right; } .params-pagination >>> .el-icon-arrow-left { background: url('/img/workbench/icon_previous.png') center center no-repeat; background-size: cover; @@ -1029,6 +808,7 @@ font-size: 20px; visibility: hidden; } .params-pagination >>> .el-icon-arrow-right { background: url('/img/workbench/icon_next.png') center center no-repeat; background-size: cover; @@ -1039,39 +819,50 @@ font-size: 20px; visibility: hidden; } .params-pagination >>> .el-pager li { min-width: 28px; } .params-pagination >>> button { min-width: 23.5px; } .params-pagination >>> .btn-prev { padding: 0px 4px 0px 2px; } .params-pagination >>> .btn-next { padding: 0px 2px 0px 4px; } .taskinfo-params-table >>> td { padding: 3px 0px; } .taskInfoMainTab >>> .el-tabs__header { margin: 0 0; } .taskInfoMainTab >>> .el-tabs__header { margin: 0 0; } .taskInfoMainTab >>> .el-tabs__header .el-tabs__item { height: 28px; line-height: 28px; } .bodyrow { .el-input { width: 80%; } .form-item { text-align: center; } } .ql-editor { color: #444; line-height: 20px; @@ -1080,26 +871,17 @@ font-size: 12px; border-bottom: 1px solid #ddd; } .task-detail-info-table >>> .custom-table-div { margin-top: 0px !important; } .task-detail-info-table >>> .custom-table-div .customTable .el-table__body-wrapper .el-table__row .cell { .task-detail-info-table>>>.custom-table-div .customTable .el-table__body-wrapper .el-table__row .cell { padding-left: 0px !important; padding-right: 0px !important; } .task-detail-info-table >>> .customTable .el-table__header-wrapper .el-table__header .el-table-column--selection .el-checkbox__input { .task-detail-info-table>>>.customTable .el-table__header-wrapper .el-table__header .el-table-column--selection .el-checkbox__input { display: none; } </style> src/views/product/workbench/workReport-feed.vue
@@ -36,7 +36,7 @@ <el-table-column label="æ¥å·¥åå·" prop="productNo" align="center"> </el-table-column> <el-table-column label="SNå·" label="åºåå·" prop="partBatchNo" align="center" :show-overflow-tooltip="true" @@ -287,6 +287,7 @@ } else { this.$message.error('æ´æ°æå ¥å¤±è´¥') } this.visible = false }) .catch((error) => {}) } else { @@ -307,6 +308,7 @@ } else { this.$message.error('æ·»å æå ¥å¤±è´¥') } this.visible = false }) .catch((error) => {}) } src/views/product/workbench/workReportCard.vue
@@ -12,16 +12,11 @@ <div class="tabDivClass"> <div class="product-out-header-left"> <div style="height:28px;line-height:28px;"> <el-divider class="pane-divider" direction="vertical"></el-divider ><span style="font-size:14px;font-weight:bold">产åº</span> <el-divider class="pane-divider" direction="vertical"></el-divider><span style="font-size:14px;font-weight:bold">产åº</span> <el-tooltip effect="dark" content="å·æ°å表" placement="top"> <el-button class="step-refresh-btn" icon="el-icon-refresh" type="info" circle @click="getBatchReport(5)" ></el-button> <el-button class="step-refresh-btn" icon="el-icon-refresh" type="info" circle @click="getBatchReport(5)"></el-button> </el-tooltip> </div> <div style="margin-left: 30px"> @@ -39,29 +34,21 @@ </div> </div> <div style="display:flex;flex-wrap:wrap;"> <el-button class="export-btn" type="primary" @click="exportOutProduct()" >å¯¼åº <el-button class="export-btn" type="primary" @click="exportOutProduct()">å¯¼åº </el-button> <el-button <!-- <el-button class="out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="addShiftProductOut()" >交çäº§åº </el-button> --> <el-button class="batch-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="addBatchProductOut()">æ±æ¥äº§åº </el-button> <el-button class="batch-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="addBatchProductOut()" >æ¹éäº§åº </el-button> <div class="print-button-class"> <!-- <div class="print-button-class"> <el-button type="danger" class="print-btn" @click="batchPrint()" >大æ ç¾æå° </el-button> @@ -83,8 +70,8 @@ v-model="batchSmallPrintRadio" @change="labelTabChange2" ></el-checkbox> </div> <div </div> --> <!-- <div class="print-button-class" v-if="permissions.product_finished_productLabel1_unlimit" > @@ -110,8 +97,8 @@ v-model="warehousingPrintSingleRadio" @change="labelTabChange3" ></el-checkbox> </div> <div </div> --> <!-- <div class="print-button-class" v-if="permissions.product_finished_productLabel2" > @@ -126,78 +113,36 @@ v-model="warehousingSmalllPrintRadio" @change="labelTabChange4" ></el-checkbox> </div> <el-button class="change-shift-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="editList()" >ç¼è¾ </div> --> <el-button class="change-shift-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="editList()">ç¼è¾ </el-button> <el-button class="batch-out-del-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="cancelSaveList()" >åæ¶ <el-button class="batch-out-del-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="cancelSaveList()">åæ¶ </el-button> <el-button class="change-shift-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="saveList()" >ä¿å <el-button class="change-shift-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="saveList()">ä¿å </el-button> <!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >交ç </el-button> --> <el-button class="submit-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()" :loading="submitLoading" >æ交 <el-button class="submit-out-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()" :loading="submitLoading">æ交 </el-button> <el-button class="batch-out-del-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()" >å é¤ <el-button class="batch-out-del-btn" type="primary" :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()">å é¤ </el-button> <el-button v-if="permissions.product_main_revoke" type="danger" class="revoke-btn" @click="revokeList()" :loading="removeLoading" >æ¤é</el-button > <el-button v-if="permissions.product_state_reset" type="primary" class="change-shift-out-btn" @click="goReset()" :loading="resetLoading" >ç¶æéç½®</el-button > <!-- v-if="permissions.product_main_revoke" --> <el-button type="danger" class="revoke-btn" @click="revokeList()" :loading="removeLoading">æ¤é</el-button> <!-- v-if="permissions.product_state_reset" --> <el-button type="primary" class="change-shift-out-btn" @click="goReset()" :loading="resetLoading">ç¶æéç½®</el-button> </div> </div> <el-table ref="productOutTable" :data="productOutputList" height="calc(100% - 118px)" :header-cell-style="productOutTableHeaderCellStyle" :row-class-name="productOutTableRowClassName" class="tracking-table" @selection-change="handleSelectionChange" > <el-table ref="productOutTable" :data="productOutputList" height="calc(100% - 118px)" :header-cell-style="productOutTableHeaderCellStyle" :row-class-name="productOutTableRowClassName" class="tracking-table" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55"> </el-table-column> <el-table-column label="åºå·" width="50px"> @@ -208,74 +153,43 @@ <el-table-column label="æ¥å·¥åå·" prop="productNo" align="center"> </el-table-column> <el-table-column label="ç¶æ" prop="state" align="center" :formatter="formatState" width="120" > <el-table-column label="ç¶æ" prop="state" align="center" :formatter="formatState" width="120"> <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">ç¶æ</div> <div class="th" @click.stop> <template> <el-select clearable v-model="paramObject.state" placeholder="å ¨é¨ç¶æ" @change="getBatchReport(5)" style="width: 100%" > <el-option v-for="item in stateTagArr" :key="item.id" :label="item.label" :value="item.value" /> <el-select clearable v-model="paramObject.state" placeholder="å ¨é¨ç¶æ" @change="getBatchReport(5)" style="width: 100%"> <el-option v-for="item in stateTagArr" :key="item.id" :label="item.label" :value="item.value" /> </el-select> </template> </div> </template> </el-table-column> <el-table-column label="é¶ä»¶ç¼å·" prop="partNo" align="center" :show-overflow-tooltip="true" > <el-table-column label="é¶ä»¶ç¼å·" prop="partNo" align="center" :show-overflow-tooltip="true"> </el-table-column> <el-table-column label="é¶ä»¶å称" prop="partName" align="center" :show-overflow-tooltip="true" > <el-table-column label="é¶ä»¶å称" prop="partName" align="center" :show-overflow-tooltip="true"> </el-table-column> <el-table-column label="SNå·" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true" > <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">SNå·</div> <el-table-column label="åºåå·" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.outBatchNo" placeholder="åºåå·"></el-input> <template v-if="!scope.row.isEdit">{{ scope.row.outBatchNo }}</template> </template> <!-- <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">åºåå·</div> <div class="th" @click.stop> <template> <el-input clearable @keyup.enter.native="getBatchReport(5)" v-model="paramObject.outBatchNo" placeholder="SNå·" @clear="getBatchReport(5)" style="width: 100%" > <el-input clearable @keyup.enter.native="getBatchReport(5)" v-model="paramObject.outBatchNo" placeholder="åºåå·" @clear="getBatchReport(5)" style="width: 100%"> </el-input> </template> </div> </template> </template> --> </el-table-column> <el-table-column <!-- <el-table-column label="è½½å ·ç¼å·" prop="reelNumber" align="center" @@ -294,8 +208,8 @@ scope.row.reelNumber }}</template> </template> </el-table-column> <el-table-column </el-table-column> --> <!-- <el-table-column label="èµ·å§ç±³æ " prop="startMeterMark" align="center" @@ -332,15 +246,26 @@ scope.row.endMeterMark }}</template> </template> </el-table-column> --> <el-table-column label="ç产æ°é" prop="productQty" align="center" width="100"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.productQty" placeholder="ç产æ°é"></el-input> <template v-if="!scope.row.isEdit">{{ scope.row.productQty }}</template> </template> </el-table-column> <el-table-column label="ç产æ°é" prop="productQty" align="center" width="100" > <el-table-column label="WDRå·" prop="wdr" align="center" width="100"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.wdr" placeholder="WDRå·"></el-input> <template v-if="!scope.row.isEdit">{{ scope.row.wdr }}</template> </template> </el-table-column> <el-table-column label="å段æè¿°" prop="segmentDesc" align="center"> <!-- <el-table-column label="å段æè¿°" prop="segmentDesc" align="center"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" @@ -353,69 +278,43 @@ scope.row.segmentDesc }}</template> </template> </el-table-column> </el-table-column> --> <el-table-column label="æ¥åºæ°é" prop="scrapQty" align="center"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.scrapQty" placeholder="æ¥åºæ°é" ></el-input> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.scrapQty" placeholder="æ¥åºæ°é"></el-input> <template v-if="!scope.row.isEdit">{{ scope.row.scrapQty }}</template> </template> </el-table-column> <el-table-column label="IFSæ¹æ¬¡å·" prop="ifsBatchNo" align="center" width="120" > <template slot="header" slot-scope="scope"> <el-table-column label="IFSæ¹æ¬¡å·" prop="ifsBatchNo" align="center" width="120"> <!-- <template slot="header" slot-scope="scope"> <div style="line-height: 14px;">IFSæ¹æ¬¡å·</div> <div class="th" @click.stop> <template> <el-input clearable @keyup.enter.native="getBatchReport(5)" v-model="paramObject.ifsBatchNo" placeholder="IFSæ¹æ¬¡å·" @clear="getBatchReport(5)" style="width: 100%" > <el-input clearable @keyup.enter.native="getBatchReport(5)" v-model="paramObject.ifsBatchNo" placeholder="IFSæ¹æ¬¡å·" @clear="getBatchReport(5)" style="width: 100%"> </el-input> </template> </div> </template> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isIfsBatchNoEdit" v-model="scope.row.ifsBatchNo" placeholder="IFSæ¹æ¬¡å·" ></el-input> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isIfsBatchNoEdit" v-model="scope.row.ifsBatchNo" placeholder="IFSæ¹æ¬¡å·"></el-input> <template v-if="!scope.row.isIfsBatchNoEdit">{{ scope.row.ifsBatchNo }}</template> </template> </template> --> </el-table-column> <el-table-column label="å¤æ³¨" prop="remark" align="center"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.remark" placeholder="å¤æ³¨" ></el-input> <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit" v-model="scope.row.remark" placeholder="å¤æ³¨"></el-input> <template v-if="!scope.row.isEdit">{{ scope.row.remark }}</template> </template> </el-table-column> <el-table-column label="çå ·éé" prop="reelWeight" align="center"> <!-- <el-table-column label="çå ·éé" prop="reelWeight" align="center"> <template slot-scope="scope"> <el-input :id="'idReport_' + +scope.$index" @@ -442,39 +341,29 @@ scope.row.grossWeight }}</template> </template> </el-table-column> <el-table-column label="ç³»ç»å·" prop="systemNo" align="center"> </el-table-column> </el-table-column> --> <!-- <el-table-column label="ç³»ç»å·" prop="systemNo" align="center"> </el-table-column> --> <el-table-column label="å·¥åºå称" prop="operationName" align="center"> </el-table-column> <el-table-column label="åä½" prop="unit" align="center"> </el-table-column> <el-table-column <!-- <el-table-column label="交çç¶æ" prop="shiftState" align="center" :formatter="formatshiftState" > </el-table-column> <el-table-column label="æå°æ¬¡æ°" prop="printNum" align="center"> </el-table-column> <el-table-column label="æä½" align="center" width="190px" fixed="right" > </el-table-column> --> <!-- <el-table-column label="æå°æ¬¡æ°" prop="printNum" align="center"> </el-table-column> --> <el-table-column label="æä½" align="center" width="80" fixed="right"> <template slot-scope="scope"> <el-tooltip effect="dark" content="æå ¥" placement="top-start"> <el-button type="text" size="small" class="blue-but" @click="searchDetail(scope.$index, scope.row)" >æå ¥</el-button > <el-button type="text" size="small" class="blue-but" @click="searchDetail(scope.$index, scope.row)">æå ¥</el-button> </el-tooltip> <el-tooltip effect="dark" content="交ç" placement="top-start"> <!-- <el-tooltip effect="dark" content="交ç" placement="top-start"> <el-button type="text" size="small" @@ -509,8 +398,8 @@ " >åæ¶äº¤ç</el-button > </el-tooltip> <el-tooltip </el-tooltip> --> <!-- <el-tooltip effect="dark" content="æ ç¾" placement="top-start" @@ -537,98 +426,63 @@ @click="smallPrintLabel(scope.row)" >å°æ ç¾</el-button > </el-tooltip> </el-tooltip> --> </template> </el-table-column> </el-table> <div class="pagin-page"> <el-pagination :current-page="queryReport.current" :page-sizes="[10, 15, 20, 50, 100]" :page-size="queryReport.size" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChangeReport" @current-change="handleCurrentChangeReport" :total="queryReport.total" > <el-pagination :current-page="queryReport.current" :page-sizes="[10, 15, 20, 50, 100]" :page-size="queryReport.size" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChangeReport" @current-change="handleCurrentChangeReport" :total="queryReport.total"> </el-pagination> </div> <batchProductOutFormDialog :currshowlist.sync="showBatchProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" :groupStatus="groupStatus" /> <shiftProductoutFormDialog :currshowlist.sync="showShiftProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" /> <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshFeedsForDel="refreshFeedsForDel" ></workReportFeed> <batchProductOutFormDialog :currshowlist.sync="showBatchProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" :groupStatus="groupStatus" /> <shiftProductoutFormDialog :currshowlist.sync="showShiftProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" /> <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshFeedsForDel="refreshFeedsForDel"></workReportFeed> <productOutFormDialog :currshowlist.sync="showProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" /> <TaskSecretForm :currshowlist.sync="showTaskSecretForm" @confirmSecret="confirmSecret" :tackingList="confirmList" :tipeInfo="tipeInfo" /> <printSecretFormDialog :currshowlist.sync="showPrintSecretForm" :outputs="selectOutputs" :statusCheck="statusCheck" @goOnPrint="goOnPrint" @cancelClose="cancelClose" @cancelCloseCancel="cancelCloseCancel" /> <productOutFormDialog :currshowlist.sync="showProductForm" :productList="productList" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList" @refreshProductOutputList="refreshProductOutputList" /> <TaskSecretForm :currshowlist.sync="showTaskSecretForm" @confirmSecret="confirmSecret" :tackingList="confirmList" :tipeInfo="tipeInfo" /> <printSecretFormDialog :currshowlist.sync="showPrintSecretForm" :outputs="selectOutputs" :statusCheck="statusCheck" @goOnPrint="goOnPrint" @cancelClose="cancelClose" @cancelCloseCancel="cancelCloseCancel" /> </div> <div> <iframe id="frame" style="width:2480px;overflow:hidden;margin-top: 200px;" :src="jimusrc" ></iframe> <iframe id="frame" style="width:2480px;overflow:hidden;margin-top: 200px;" :src="jimusrc"></iframe> </div> <el-dialog title="产åºåæ ¼åºä½" :visible.sync="dialogVisible" width="30%"> <span>åæ ¼åºä½ï¼</span> <el-select v-model="locationIdValue" placeholder="请éæ©"> <el-option v-for="item in options" :key="item.index" :label="`${item.locNo}+${item.locName}`" :value="item.id"> </el-option> </el-select> <span slot="footer" class="dialog-footer"> <el-button @click="dialogVisible = false; isTrue = false">å æ¶</el-button> <el-button type="primary" @click="clickSureSubmit">ç¡® å®</el-button> </span> </el-dialog> </div> </template> <style lang="scss" scoped> .cancel-btn { background-image: -webkit-linear-gradient( 90deg, background-image: -webkit-linear-gradient(90deg, rgba(254, 100, 84, 0.8) 0%, rgba(252, 84, 75, 0.8) 50%, rgba(250, 69, 65, 0.8) 100% ); background-image: -moz-linear-gradient( 90deg, rgba(250, 69, 65, 0.8) 100%); background-image: -moz-linear-gradient(90deg, rgba(254, 100, 84, 0.8) 0%, rgba(252, 84, 75, 0.8) 50%, rgba(250, 69, 65, 0.8) 100% ); background-image: linear-gradient( 90deg, rgba(250, 69, 65, 0.8) 100%); background-image: linear-gradient(90deg, rgba(254, 100, 84, 0.8) 0%, rgba(252, 84, 75, 0.8) 50%, rgba(250, 69, 65, 0.8) 100% ); rgba(250, 69, 65, 0.8) 100%); color: #fff; border-color: #fbecec; border-radius: 10px; @@ -652,24 +506,18 @@ } .submit-btn { background-image: -webkit-linear-gradient( 90deg, background-image: -webkit-linear-gradient(90deg, rgba(80, 213, 118, 0.8) 0%, rgba(73, 209, 87, 0.8) 50%, rgba(65, 205, 58, 0.8) 100% ); background-image: -moz-linear-gradient( 90deg, rgba(65, 205, 58, 0.8) 100%); background-image: -moz-linear-gradient(90deg, rgba(80, 213, 118, 0.8) 0%, rgba(73, 209, 87, 0.8) 50%, rgba(65, 205, 58, 0.8) 100% ); background-image: linear-gradient( 90deg, rgba(65, 205, 58, 0.8) 100%); background-image: linear-gradient(90deg, rgba(80, 213, 118, 0.8) 0%, rgba(73, 209, 87, 0.8) 50%, rgba(65, 205, 58, 0.8) 100% ); rgba(65, 205, 58, 0.8) 100%); color: #fff; border-color: #fbecec; border-radius: 10px; @@ -682,8 +530,7 @@ } .tracking-change-state-div >>> .tracking-btn-submit { background: url('/img/workbench/icon_tracking_submit.png') center center no-repeat; background: url('/img/workbench/icon_tracking_submit.png') center center no-repeat; background-size: cover; } @@ -694,21 +541,15 @@ } .revoke-btn { background-image: -webkit-linear-gradient( 90deg, background-image: -webkit-linear-gradient(90deg, rgba(254, 91, 53, 0.8) 0%, rgba(245, 68, 50, 0.8) 100% ); background-image: -moz-linear-gradient( 90deg, rgba(245, 68, 50, 0.8) 100%); background-image: -moz-linear-gradient(90deg, rgba(254, 91, 53, 0.8) 0%, rgba(245, 68, 50, 0.8) 100% ); background-image: linear-gradient( 90deg, rgba(245, 68, 50, 0.8) 100%); background-image: linear-gradient(90deg, rgba(254, 91, 53, 0.8) 0%, rgba(245, 68, 50, 0.8) 100% ); rgba(245, 68, 50, 0.8) 100%); color: #fff; border-color: #fbecec; border-radius: 15px; @@ -722,21 +563,15 @@ } .print-btn { background-image: -webkit-linear-gradient( 90deg, background-image: -webkit-linear-gradient(90deg, rgba(83, 53, 254, 0.8) 0%, rgba(52, 50, 213, 0.8) 100% ); background-image: -moz-linear-gradient( 90deg, rgba(52, 50, 213, 0.8) 100%); background-image: -moz-linear-gradient(90deg, rgba(83, 53, 254, 0.8) 0%, rgba(52, 50, 213, 0.8) 100% ); background-image: linear-gradient( 90deg, rgba(52, 50, 213, 0.8) 100%); background-image: linear-gradient(90deg, rgba(83, 53, 254, 0.8) 0%, rgba(52, 50, 213, 0.8) 100% ); rgba(52, 50, 213, 0.8) 100%); color: #fff; border-color: #fbecec; border-radius: 15px; @@ -1020,6 +855,7 @@ getProductMainV1, batchUpdateProductMain, batchChange, batchChangeCopy, batchCancelProductMain, productOutPutStateByMainId, getPrintUrl, @@ -1031,12 +867,15 @@ validateIsLastOperation, validateChangeProductOut, resetState, updatePrintNum updatePrintNum, cancellationOfWorkApplication } from '@/api/product/personboard' import { batchLabelPrint, checkBatchLabelPrint, batchLabelPrintTimes batchLabelPrintTimes, qualifiedLocation, isProductionCounting } from '@/api/product/handymantype' import batchProductOutFormDialog from './batchproductout-form-new.vue' import { mapGetters } from 'vuex' @@ -1090,6 +929,7 @@ }, data() { return { dialogVisible: false, showPrintSecretForm: false, printLabelType: null, printData: null, @@ -1097,7 +937,7 @@ { value: '01draft', label: 'è稿' }, { value: '02submitted', label: 'å·²æ交' }, { value: '04processing', label: 'å¤çä¸' }, { value: '03changeshift', label: '交ç' } // { value: '03changeshift', label: '交ç' } ], tableData: [], multipleSelection: [], @@ -1178,14 +1018,27 @@ warehousingPrintSingleRadio: false, warehousingSmalllPrintRadio: false, statusCheck: true, selectOutputs: [] selectOutputs: [], isProductionCountingShow: false, isTrue: false, options: [], locationIdValue: null, } }, created() {}, created() { }, updated() { this.isProductionCounting() }, computed: { ...mapGetters(['permissions', 'userInfo']) }, methods: { isProductionCounting() { isProductionCounting({ taskId: this.currOperateTask.taskId }).then(res => { this.isProductionCountingShow = res.data }) }, cancelClose() { this.statusCheck = true }, @@ -3222,11 +3075,12 @@ }, saveList() { const list = JSON.parse(JSON.stringify(this.productOutputList)) console.log(`output->list`, list) const data = [] list.forEach((el) => { if (el.isEdit) { var productVo = {} productVo.id = el.id productVo.id = el.outputId productVo.operationTaskId = this.currOperateTask.id productVo.workstationId = el.workstationId var productOuts = [] @@ -3235,7 +3089,9 @@ productOut.endMeterMark = el.endMeterMark productOut.productQty = el.productQty productOut.segmentDesc = el.segmentDesc productOut.outBatchNo = el.outBatchNo productOut.scrapQty = el.scrapQty productOut.wdr = el.wdr productOut.ifsBatchNo = el.ifsBatchNo productOut.reelNumber = el.reelNumber productOut.reelWeight = el.reelWeight @@ -3252,7 +3108,6 @@ validateOverProduction(data).then((response) => { const resData = response.data if (resData.code === 0) { if (resData.data.success) { validateOverFeed(data) .then((resp) => { const respData = resp.data @@ -3306,11 +3161,6 @@ console.log('失败' + new Date().getTime()) }) } else { this.tipeInfo = resData.data.message this.showTaskSecretForm = true this.confirmList = data } } else { this.$message.error('å·¥åæ°éæ ¡éªå¤±è´¥') } }) @@ -3319,6 +3169,7 @@ // åæ¶ç¼è¾ cancelSaveList() { this.editShow = false this.getBatchReport(2) this.productOutputList.forEach((element) => { if (element.isEdit) { element.isEdit = false @@ -3338,6 +3189,10 @@ this.paramObject ) const _that = this /* if (!this.isProductionCountingShow) { this.$message.error('å½åå·¥åæ éæ¥å·¥æä½') return } */ getProductMainV1(obj).then((res) => { _that.productOutputList = res.data.data.records // console.log(_that.productOutputList) @@ -3407,10 +3262,29 @@ // æ交æ¥å submitList() { if (this.multipleSelection.length > 0) { if (this.multipleSelection.length > 10) { this.$message.error('æå¤åªè½éæ©10æ¡è®°å½è¿è¡æ交ï¼') if (this.multipleSelection.length > 1) { this.$message.error('æå¤åªè½éæ©1æ¡è®°å½è¿è¡æ交ï¼') return false } else { qualifiedLocation(this.multipleSelection[0].workstationId).then(res => { this.options = res.data.data if (this.options.length > 1) { this.dialogVisible = true } else { this.locationIdValue = this.options[0].id this.submitListApi() } }) } } else { this.$message.error('请éæ©éè¦æ交ç对象') } }, clickSureSubmit() { this.dialogVisible = false this.submitListApi() }, submitListApi() { const list = this.multipleSelection if (this.getFlag(list)) { this.submitLoading = true @@ -3446,8 +3320,15 @@ list.forEach((ele) => { var outIds = [] outIds.push(ele.id) batchChange(outIds, event) const qury = Object.assign({ ids: outIds, locationId: this.locationIdValue, outputId: this.multipleSelection[0].outputId }) batchChangeCopy(qury, event) .then((response) => { this.locationIdValue = null this.isTrue = false successSize++ submitSize++ if (submitSize === list.length) { @@ -3521,9 +3402,6 @@ // }) // .catch((error) => {}) } } else { this.$message.error('请éæ©éè¦æ交ç对象') } }, // æ¤éæ¥å revokeList() { @@ -3539,7 +3417,9 @@ var outIds = list.map((ele) => { return ele.id }) batchChange(outIds, event) cancellationOfWorkApplication({ mainId: outIds[0] }) .then((response) => { this.removeLoading = false this.$message.success('æ¤éæå') src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@ <h2 v-else>ç¼è¾-产åæ£éªå</h2> </div> <div class="btn-group header-right"> <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">çææ£éªé¡¹ç®</el-button> <el-button @click="addTestProject" v-if="processInspectVo.id==null">çææ£éªé¡¹ç®</el-button> </div> </div> <div class="page-main"> @@ -390,16 +390,27 @@ }) }, updateDevice(row,index){ updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{ let rowId=JSON.stringify(row.iid) console.log(row); updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{ this.inspectionItems.forEach(obj=>{ if(obj.children){ obj.children[index-1].inspectionValue = '' obj.children[index-1].iresult = null obj.children[index-1].empiricalValueAddss = [] obj.children[index-1].inote='' obj.children.forEach(c=>{ if(c.iid==rowId){ c.inspectionValue = null c.iresult = null c.empiricalValueAddss = [] c.inote='' } }) // if(obj.children){ // obj.children[index-1].inspectionValue = '' // obj.children[index-1].iresult = null // obj.children[index-1].empiricalValueAddss = [] // obj.children[index-1].inote='' // } }) }).catch(error=>{ console.log(error) }) src/views/quality/finishedProductInspection/finishedProducter-print.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,1668 @@ <template> <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 20pt;"> <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:607pt'> <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'> <td colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'> <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'> <img width=174 height=58 src="../../../../public/img/image001.jpg"> </span> </td> <td colspan=6 class=xl6624921 width=399 style='border-right:.5pt solid black;border-left:none;width:250pt'>è®°å½å称:è¿æ¥å¨åæåæ£éªè®°å½è¡¨</td> <td colspan=3 class=xl6624921 width=226 style='border-left:none;width: 150pt'>ä¿åæé:25å¹´</td> <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:126pt' >çæ¬å·: A/0</td> </tr> <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'> <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black; height:25.05pt;border-left:none'>è®°å½ç¼å·:ZTT/QR-8.6-05ï¼A/0)</td> <td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>å½æ¡£é¨é¨:è´¨éä¿è¯é¨</td> <td colspan=2 class=xl6824921 style='border-top:none'></td> </tr> <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'> <td colspan=16 height=33 class=xl7424921 width=1194 style='height:25.05pt; width:897pt'>è¿æ¥å¨åæåæ£éªè®°å½è¡¨</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>项ç®å称:</td> <td colspan=5 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>ã <p class="MsoNormal" align="center" style="text-align:center"> <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span></p> </td> <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>æ£éªä¾æ®:</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> ã </td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>产åå称:</td> <td colspan=4 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> <p class="MsoNormal" align="center" style="text-align:center"> <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span></p> </td> <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>产ååå·:</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> <p class="MsoNormal" align="center" style="text-align:center"> <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span></p> </td> <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>产åæ°é:</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> <p class="MsoNormal" align="center" style="text-align:center"> <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span></p> </td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>æ£éªå 容:</td> <td colspan=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>æ£éªç»æ</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>éæ/线åº</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>éæ: â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>线åº: â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>ç»ç¼çµé»â¥</p><p>______00MΩ</p><p>_____00VDC</p></td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>æµè¯ç»</p><p>ææå°</p><p>å¼</p></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td> <td colspan=3 rowspan="3" class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>éæ/线åº</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>1600VCD, lmin: â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>2200VCD, lmin: â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>4500VCD, lmin: â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>00VCD, min: â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=4 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>éä¿¡</p><p>( 1 æ 2)</p></td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>1</td> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>符åTIA Cat 5e Channelæ åï¼ â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=3 rowspan="4" class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>2</td> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>åå ç½éä¿¡æµè¯éçâ¥800Mbps/ç¾å ç½éä¿¡æµè¯éçâ¥80Mbps</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>æå ¥æèâ¤</p> <p> _________dB</p><p>â¡1310,â¡1550</p></td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>åæ³¢æèâ¤</p> <p> _________dB</p><p>â¡1310,â¡1550</p></td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>æ°å¯æ§</td> <td colspan=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>æ座ï¼0.3MPa@60sï¼ï¼ â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>æ°´å¯æ§</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>15MPaä¿å10min, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> 36MPaä¿å2h, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>36MPaä¿å10min, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> 75MPaä¿å2h, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>MPaä¿å min, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> MPaä¿å h, 2次 â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>æ°´ååéæ</td> <td colspan=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>æ°´ååç»ç¼çµé»</p><p>(è¦æ±åä¸)</p></td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>æµè¯å¼</p><p>ç»ææå°å¼</p></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>å¤è§æ£æ¥</td> <td colspan=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>çµç¼é¿åº¦(m)</p><p>æ导线é¿åº¦(cm)</p></td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>æµè¯ç»æ</p><p>åå·®æ大å¼</p></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>æéé«ä½è½å·®</p><p>â¤0.6mm</p></td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>æµè¯ç»æ</p><p>åå·®æ大å¼</p></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产å_</td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>â¡åæ ¼</p><p>â¡ä¸åæ ¼</p></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=9 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>çµç¼å¼¯æ²åå¾</td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> è¦æ±</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> å®æµ</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>åè´§</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>产ååå·æ ¸å¯¹</td> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>ä¸è£ ç®±æ¸ ååå·ä¸è´:</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>产åæ°éæ¸ ç¹</td> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>ä¸è£ ç®±æ¸ åæ°éä¸è´:</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>产åå头æ£æ¥</td> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>ä¸è£ ç®±æ¸ åå 容ä¸è´,ç²è´´ä¸æ¾ç¼ä½ç½®,没ææå:</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=6 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>产åå è£ æ£æ¥</td> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>åä¸åå·äº§ååç¬å è£ :</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>è¿å¸½é¢è²ä¸æ件è¦æ±ä¸è´</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>纸箱使ç¨éæè¶å¸¦ææ伸è裹紧</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr><tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>æ¨ç®±å é¨å¿ é¡»å«å¥½æ³¡æ²«çº¸,éç´§æ¨ç®±,é¢å¸¦æç´§</td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr><tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>使ç¨çç æ£æ¿åºå®æ头ãæ座ä½ç½®ï¼åºå®æ座尾线ä½ç½®</p> <p>ç¨æç¥èå°äº§ååºå®å¨çç é¢æ¿å </p></td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>ååºäº§åä¸å¾åºç°ä»»ä½å½¢å¼çä¾åºåä¿¡æ¯ï¼å æ¬ç¼çä¸çæ ç¾ãçµç¼</p><p>ä¸ä¾åºåå称ç</p></td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> â¡åæ ¼ â¡ä¸åæ ¼</td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'><p> æ£éª/æ¶é´:</p></td> <td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'><p> 审æ¹:</p></td> </tr> <tr height=0 style='display:none'> <td width=64 style='width:48pt'></td> <td width=58 style='width:44pt'></td> <td width=137 style='width:103pt'></td> <td width=262 style='width:197pt'></td> <td width=212 style='width:159pt'></td> <td width=226 style='width:170pt'></td> <td width=235 style='width:176pt'></td> </tr> </table> </div> </template> <script> export default { props:{ formData:{ type: Object, default:()=>{ return {} } } }, data(){ return{ tableData: null, projectList: [], deviceStr: null, product:null, number:null, typedata:null, childrenData: [], typedata:null, num:null, } }, created(){ this.tableData = this.formData console.log("============",this.tableData) this.initData() // this.initProjectList(this.projectList) }, methods:{ initData(){ this.deviceStr = this.tableData.projectName this.product = this.tableData.material this.number = this.tableData.quantity this.typedata = this.tableData.specs }, }, watch:{ formData(newVal){ if(newVal){ this.projectList = [] console.log(newVal) this.tableData = newVal this.initData() // this.initProjectList(this.projectList) } } }, } </script> <style scoped> table{ mso-displayed-decimal-separator: "\."; mso-displayed-thousand-separator: "\,"; } .xl6524921 { padding: 0px; mso-ignore: padding; color: black; font-size: 10.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: middle; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl6624921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl6724921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl6824921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl6924921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7024921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl7124921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: top; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl7224921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: top; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl7324921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7424921 { padding: 0px; mso-ignore: padding; color: black; font-size: 14.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl7524921 { padding: 0px; mso-ignore: padding; color: black; font-size: 14.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7624921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7724921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7824921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl7924921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl8024921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl8124921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl8224921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl8324921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8424921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8524921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8624921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8724921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8824921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl8924921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl9024921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: none; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9124921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: none; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9224921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: none; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9324921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl9424921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9524921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9624921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9724921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: top; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9824921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: top; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl9924921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: top; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl10024921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl10124921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl10224921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: general; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10324921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 700; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: left; vertical-align: middle; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10424921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: none; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10524921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: none; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10624921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10724921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: nowrap; } .xl10824921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: none; border-bottom: none; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl10924921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: .5pt solid windowtext; border-right: .5pt solid windowtext; border-bottom: none; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl11024921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: none; border-bottom: none; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl11124921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: .5pt solid windowtext; border-bottom: none; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl11224921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: none; border-bottom: .5pt solid windowtext; border-left: .5pt solid windowtext; mso-background-source: auto; mso-pattern: auto; white-space: normal; } .xl11324921 { padding: 0px; mso-ignore: padding; color: black; font-size: 12.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-number-format: General; text-align: center; vertical-align: middle; border-top: none; border-right: .5pt solid windowtext; border-bottom: .5pt solid windowtext; border-left: none; mso-background-source: auto; mso-pattern: auto; white-space: normal; } ruby { ruby-align: left; } rt { color: windowtext; font-size: 9.0pt; font-weight: 400; font-style: normal; text-decoration: none; font-family: å®ä½; mso-generic-font-family: auto; mso-font-charset: 134; mso-char-type: none; } </style> src/views/quality/finishedProductInspection/index.vue
@@ -16,7 +16,7 @@ top="10vh" title="æå°é¢è§" :visible.sync="printDialogVisible" width="65%"> width="70%"> <div style="width:100%;height: 60vh;overflow-y: scroll;"> <printTemplate id="printRaw" :formData="printFormData"></printTemplate> </div> @@ -35,7 +35,7 @@ import finishedProductInspectionAdd from './finishedProduct-form' import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct' import { transform } from '@/util/fileTransform' import printTemplate from './finishedProduct-print.vue' import printTemplate from './finishedProducter-print.vue' import PrintJS from 'print-js' export default { components: { @@ -210,17 +210,7 @@ } }, methods: { //æ¥çæ¥åæé® // showPrint(row){ // queryById(row.id).then(res=>{ // console.log(res); // this.printFormData = res.data.data // this.printDialogVisible = true // }) // .catch(error=>{ // console.log(error); // }) // }, //æå°æé® printFun() { this.printDialogVisible = false; @@ -234,7 +224,9 @@ orientation: 'portrait' }); }, //æ¥çæ¥åæé® showPrint(row){ console.log('----------'); queryById(row.id).then(res=>{ this.printFormData = res.data.data this.printDialogVisible = true src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -358,7 +358,6 @@ }, // 确认åè° selectPart(param, nodePart, index) { console.log(param) if (typeof param !== 'undefined') { this.dataForm.code = param.code this.dataForm.name = param.name @@ -695,7 +694,21 @@ row.children.push(obj) }, save(){ let data = this.dataForm console.log('--------',data); console.log("-----",this.list); this.list.forEach(item=>{ item.children.forEach(c=>{ let arr=c.testValueList let val='' arr.forEach(a=>{ val+=a+"," }) let end=val.substring(0,val.length-1) c.testValue=end }) }) data.rawInsProducts = this.list addRawInspects(data).then(res=>{ this.$message.success("ä¿åæå") vue.config.js
@@ -2,9 +2,8 @@ * é ç½®åè: * https://cli.vuejs.org/zh/config/ */ // const url = 'http://192.168.0.23:9999' // const url = 'http://192.168.0.51:9999' const url = 'http://192.168.0.23:9999' const url = 'http://localhost:9999' // const url = 'http://ztt-gateway:9999' // const url = 'http://ztt-gateway:9999' const localUrl = 'http://localhost:8089' //const localUrl = 'http://10.88.15.95:8089'
