From a6d2ac8b37c95e59e207a20e9fa24b1f6222bf40 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期四, 07 十二月 2023 09:35:43 +0800 Subject: [PATCH] 项目表 --- web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 78 +++++++++++++++++++++++++++++--------- 1 files changed, 59 insertions(+), 19 deletions(-) diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue index 5c945e7..5fe0cab 100644 --- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue +++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue @@ -1,5 +1,5 @@ <template> - <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :append-to-body="true"> + <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :stepMarker="stepMarker" :append-to-body="true"> <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="testCheckFormAuto"> <div> @@ -16,10 +16,15 @@ <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input> </el-form-item> <el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%"> - <el-input v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input> + <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input> </el-form-item> <el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%"> - <el-input v-model="dataForm.testCheckOrder.examDate" placeholder="妫�鏌ユ椂闂�"></el-input> + <el-date-picker + :disabled="stepMarker!=='csjcd_first'" + v-model="dataForm.testCheckOrder.examDate" + type="date" + placeholder="璇烽�夋嫨妫�鏌ユ椂闂�"> + </el-date-picker> </el-form-item> </div> <div style="border-bottom: 1px solid rgba(0,0,0,.2);"> @@ -35,13 +40,13 @@ </template> </el-table-column> <el-table-column prop="checkContent" min-width="180" label="涓昏妫�鏌ュ唴瀹�"> - <template v-slot="{ row }"> - <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input> - </template> +<!-- <template v-slot="{ row }">--> +<!-- <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>--> +<!-- </template>--> </el-table-column> - <el-table-column prop="checkResult" align="center" width="150" label="妫�鏌ョ粨鏋�"> + <el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�"> <template v-slot="{ row }"> - <zt-dict v-model="row.checkResult" dict="is_or_not" :radio="true"></zt-dict> + <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict> </template> </el-table-column> <el-table-column prop="remark" label="澶囨敞" width="100" align="center"> @@ -92,7 +97,7 @@ </div> <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;"> <el-form-item style="width: 100%;padding-left:20px;margin:0;"> - <el-input v-model="dataForm.testCheckOrder.processor" placeholder="澶勭悊浜�"></el-input> + <span>{{dataForm.testCheckOrder.processor}}</span> </el-form-item> </div> <div style="width: 84px;text-align: center;font-weight: 600"> @@ -100,7 +105,7 @@ </div> <div class="el-border-left acceptDate1" style="width: 40%;height: 40px;"> <el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0"> - <el-input v-model="dataForm.testCheckOrder.verifier" placeholder="楠岃瘉浜�"></el-input> + <span>{{dataForm.testCheckOrder.verifier}}</span> </el-form-item> </div> </div> @@ -116,9 +121,10 @@ export default { data() { return { - parentRow: null, + stepMarker: '', + configDetailRow: null, subtitle: '', - pageName: {plan: '娴嬭瘯璁″垝', explain: '娴嬭瘯璇存槑', record: '娴嬭瘯璁板綍', report: '娴嬭瘯鎶ュ憡'}, + pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'}, dataForm: { id: '', projectId: '', @@ -141,9 +147,10 @@ }, methods: { init(id, row) { - this.parentRow = row - console.log(id, row, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟') - if (id) { + this.configDetailRow = row + if (row.checkId) { + this.dataForm.id = row.checkId + } else if (id) { this.dataForm.id = id } else { this.dataForm.id = row.id @@ -154,15 +161,25 @@ if (row.projectId) { this.dataForm.projectId = row.projectId } - + console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟') + if (this.configDetailRow) { + if (!row.stepMarker) { + this.stepMarker = 'csjcd_first' + this.title = '鍙戣捣娴嬭瘯妫�鏌ュ崟' + } else { + this.title = row.stepName + this.stepMarker = row.stepMarker + } + } //this.dataForm.disabled this.getInfo() + //console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker') }, - // 鑾峰彇淇℃伅 indexFormat(index) { return index += 1 }, + // 鑾峰彇淇℃伅 async getInfo() { let params = { checkId: this.dataForm.id, @@ -177,12 +194,35 @@ } }, // 琛ㄥ崟鎻愪氦 - async formSubmit() { + async formSubmit(submitType) { + if (submitType == 'tj') { + let isFlow = false + for (let item of this.dataForm.checkOrderList) { + if (!item.checkResult) { + this.$alert("鏈夋湭濉啓鐨勬暟鎹�") + return + } else if (item.checkResult == "2") { + isFlow = true + } + } + if (submitType == 'tj' && !isFlow) { + submitType == '' + } + } + if (submitType == 'tj' || submitType == 'bl' && isFlow) { + let flowInfo = { + flowCode: 'csjcd', + stepIdMark: this.stepMarker, + submitType: submitType + } + this.dataForm.flowInfoDto = flowInfo; + } + let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/testCheckOrder/TestCheckOrder/', this.dataForm) if (res.success) { await this.$tip.success() this.$refs.dialog.close() - this.$emit('recall', this.dataForm, this.parentRow) + this.$emit('recall', res.data, this.configDetailRow) } } } -- Gitblit v1.9.1