From 9a0e4f1641f41a3dc1df4453ad416fb1522bd2ea Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 18 一月 2024 17:30:49 +0800 Subject: [PATCH] modified: src/page/wel.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue --- src/views/quality/Packaging_ledger/index.vue | 182 ++++++++++++++++++++++++--------------------- 1 files changed, 97 insertions(+), 85 deletions(-) diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue index 445cd33..1e66617 100644 --- a/src/views/quality/Packaging_ledger/index.vue +++ b/src/views/quality/Packaging_ledger/index.vue @@ -8,7 +8,7 @@ :isShowHide="true" :prelang="prelang" :ajaxFun="ajaxFun" - :options="options" + :options="options" @handleSelectionChange="handleSelectionChange" ref="processconfiguration" > @@ -33,7 +33,7 @@ </el-col> <el-col :span="2"> <el-button - v-if="permissions.quality_packaging_ledger_info_save" + v-if="!isCheck && permissions.quality_packaging_ledger_info_add" style="float: right; padding: 3px 0" type="text" @click="addpreserve" @@ -52,75 +52,75 @@ </el-row> </div> <el-table - :data="testStandardParams" - id="testStandardParamTable" - ref="testStandardParam" - - highlight-current-row - height="700" - style="width: 100%" - class="l-mes-table" - border - stripe - > - <el-table-column - type ="index" - label="搴忓彿" - align="center" - width="50" - /> - <el-table-column - label="浜у搧" - prop="product" - show-overflow-tooltip - align="center" - /> - <el-table-column - label="浜у搧缂栧彿" - prop="productNo" - show-overflow-tooltip - align="center" - > - </el-table-column> - <el-table-column - label="鎵规鍙�" - prop="outBatchNo" - show-overflow-tooltip - align="center" - > - </el-table-column> - <el-table-column - label="瑙勬牸鍨嬪彿" - prop="specs" - show-overflow-tooltip - align="center" - > - </el-table-column> - <el-table-column - label="鍗曚綅" - prop="unit" - show-overflow-tooltip - align="center" - > - </el-table-column> - <el-table-column - label="鏁伴噺" - prop="number" - align="center" - show-overflow-tooltip - width="80" - ></el-table-column> - <el-table-column - v-if="permissions.quality_packaging_ledger_info_operate" - fixed="right" - label="鎿嶄綔" - align="center" - width="80"> - <template slot-scope="scope"> - <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete" size="small">鍒犻櫎</el-button> - </template> - </el-table-column> - </el-table> + :data="testStandardParams" + id="testStandardParamTable" + ref="testStandardParam" + + highlight-current-row + height="700" + style="width: 100%" + class="l-mes-table" + border + stripe + > + <el-table-column + type ="index" + label="搴忓彿" + align="center" + width="50" + /> + <el-table-column + label="浜у搧" + prop="product" + show-overflow-tooltip + align="center" + /> + <el-table-column + label="浜у搧缂栧彿" + prop="productNo" + show-overflow-tooltip + align="center" + > + </el-table-column> + <el-table-column + label="鎵规鍙�" + prop="outBatchNo" + show-overflow-tooltip + align="center" + > + </el-table-column> + <el-table-column + label="瑙勬牸鍨嬪彿" + prop="specs" + show-overflow-tooltip + align="center" + > + </el-table-column> + <el-table-column + label="鍗曚綅" + prop="unit" + show-overflow-tooltip + align="center" + > + </el-table-column> + <el-table-column + label="鏁伴噺" + prop="number" + align="center" + show-overflow-tooltip + width="80" + ></el-table-column> + <el-table-column + v-if="permissions.quality_packaging_ledger_info_operate" + fixed="right" + label="鎿嶄綔" + align="center" + width="80"> + <template slot-scope="scope"> + <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete" size="small">鍒犻櫎</el-button> + </template> + </el-table-column> + </el-table> </el-card> </el-col> </el-row> @@ -145,7 +145,7 @@ <el-col :span="10" :offset="3">搴忓彿锛�</el-col> <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col> </el-row> - <el-row> + <el-row> <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col> <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col> </el-row> @@ -183,7 +183,7 @@ multipleSelection: [], isCheck: false, dataway:{}, - goid:'', + datalist:[], testStandardParams: [], packageBoxId:{}, prelang: 'operation', @@ -312,7 +312,14 @@ icon: 'el-icon-position', type: 'text', size: 'small', - fun: this.check + fun: this.check, + show: { + val: [ + '鑽夌', + '鏈姤妫�', + ], + key: 'state' + } }) } if(this.permissions.quality_packaging_ledger_del){ @@ -337,6 +344,8 @@ } }, methods: { + //鍖呰璇︽儏 + //鎵撳嵃鎸夐挳 printFun() { this.diaPrintTab = false; @@ -344,7 +353,7 @@ printable: 'qrCard',//椤甸潰 type: "html",//鏂囨。绫诲瀷 maxWidth:450, - targetStyles:['*'], + targetStyles:['*'], style: `@page { margin:0; padding: 0; @@ -366,7 +375,6 @@ }, handleSelectionChange(val){ this.multipleSelection = val - console.log(this.multipleSelection[0].id,"鏁版嵁"); let lastRow = val[val.length - 1] this.handleCurrentChange(lastRow) }, @@ -404,18 +412,19 @@ }) }, handleCurrentChange(row){ - if(row.state=='宸叉姤妫�'){ + if(row.state=='鏈姤妫�'){ + this.isCheck = false + }else{ this.isCheck = true } this.dataway = row this.packageBoxId = { packageBoxId:row.id } - this.goid = row.id this.rightquery() }, rightquery(){ - list({packageBoxId:this.goid}).then((res) =>{ + list({packageBoxId:this.packageBoxId.packageBoxId}).then((res) =>{ this.testStandardParams = res.data.data }) }, @@ -428,18 +437,21 @@ } }, preserve(datalist){ - this.testStandardParams = datalist + this.testStandardParams = this.testStandardParams.concat(datalist); + console.log(this.testStandardParams,"---------start"); + this.datalist = datalist }, //鍙宠竟淇濆瓨 addpreserve(){ - this.testStandardParams.forEach(el => { - el.packageBoxId =this.goid + this.datalist.forEach(el => { + el.packageBoxId =this.packageBoxId.packageBoxId }); - console.log(this.testStandardParams); + console.log(this.datalist); // return - saveList(this.testStandardParams).then((res) =>{ + saveList(this.datalist).then((res) =>{ if(res.status===200){ this.$message.success('淇濆瓨鎴愬姛') + this.datalist = null this.rightquery() } }).catch(error=>{ @@ -468,4 +480,4 @@ }, }, } -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3