From 1c278e228e53f461dba034a719b88ea3d820c8d3 Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期一, 27 十一月 2023 10:24:43 +0800 Subject: [PATCH] 编号 --- web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 454 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 379 insertions(+), 75 deletions(-) diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue index 534782c..59a3e4e 100644 --- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue +++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue @@ -1,60 +1,301 @@ <template> - <zt-dialog ref="dialog" column="2" @confirm="formSubmit"> - <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px"> - <zt-form-item label="椤圭洰ID" prop="projectId" rules="required"> - <el-input v-model="dataForm.projectId"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧娴佽浆鍗曠紪鍙�" prop="code" rules="required"> - <el-input v-model="dataForm.code"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰" prop="itemRequire" rules="required"> - <el-input v-model="dataForm.itemRequire"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰鐨勫叾浠�" prop="itemOther" rules="required"> - <el-input v-model="dataForm.itemOther"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鎺ユ敹浜�" prop="itemAccept" rules="required"> - <el-input v-model="dataForm.itemAccept"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鎺ユ敹鏃堕棿" prop="acceptDate" rules="required"> - <el-input v-model="dataForm.acceptDate"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鎺ユ敹鎯呭喌璇存槑" prop="acceptSituation" rules="required"> - <el-input v-model="dataForm.acceptSituation"></el-input> - </zt-form-item> - <zt-form-item label="鏍″噯妫�娴嬩汉" prop="calibratDetect" rules="required"> - <el-input v-model="dataForm.calibratDetect"></el-input> - </zt-form-item> - <zt-form-item label="鏍″噯妫�娴嬫椂闂�" prop="detectDate" rules="required"> - <el-input v-model="dataForm.detectDate"></el-input> - </zt-form-item> - <zt-form-item label="鏍″噯妫�娴嬫儏鍐佃鏄�" prop="detectSituation" rules="required"> - <el-input v-model="dataForm.detectSituation"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍏ュ簱浜�" prop="warehouse" rules="required"> - <el-input v-model="dataForm.warehouse"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍏ュ簱鏃堕棿" prop="warehouseDate" rules="required"> - <el-input v-model="dataForm.warehouseDate"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍏ュ簱鎯呭喌" prop="warehouseSituation" rules="required"> - <el-input v-model="dataForm.warehouseSituation"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍙戞斁浜�" prop="itemIssue" rules="required"> - <el-input v-model="dataForm.itemIssue"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍙戞斁鏃堕棿" prop="issueDate" rules="required"> - <el-input v-model="dataForm.issueDate"></el-input> - </zt-form-item> - <zt-form-item label="鐗╁搧鍙戞斁鎯呭喌璇存槑" prop="issueSituation" rules="required"> - <el-input v-model="dataForm.issueSituation"></el-input> - </zt-form-item> - <zt-form-item label="澶囨敞" prop="remark" rules="required"> - <el-input v-model="dataForm.remark"></el-input> - </zt-form-item> - <zt-form-item label="骞翠唤" prop="year" rules="required"> - <el-input v-model="dataForm.year"></el-input> - </zt-form-item> + <zt-dialog ref="dialog" column="3" @confirm="formSubmit"> + <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto"> + <div class=""> + <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px"> + <span>{{dataForm.circulatOrder.code}}</span> + </el-form-item> + </div> + <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" > + <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="circulationContentWidth"> + <el-form-item class="marginTopAndMarginBottom" label="涓撲笟瀹為獙瀹�" style="width: 32%"> + <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="涓撲笟瀹為獙瀹�"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom" label="浠诲姟缂栧彿" style="width: 32%"> + <el-input v-model="dataForm.project.softwareIdentity" placeholder="浠诲姟缂栧彿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鍚嶇О" style="width: 32%"> + <el-input v-model="dataForm.project.softwareName" placeholder="鐗╁搧鍚嶇О"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鍨嬪彿" style="width: 32%"> + <zt-dict v-model="dataForm.project.softwareType" dict="is_embed_software" :radio="true"></zt-dict> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鐗╁搧缂栧彿" style="width: 32%"> + <el-input v-model="dataForm.project.softwareIdentity" placeholder="鐗╁搧缂栧彿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鏁� 閲�" style="width: 32%"> + <el-input v-model="dataForm.project.isContract" placeholder="鏁伴噺"></el-input> + </el-form-item> + </div> + <div style="border-bottom: 1px solid rgba(0,0,0,.2);"> + <div style="padding-left:5px;padding-right:5px;"> + <div style="padding: 5px">鐗╁搧鎶�鏈祫鏂欏強鏁伴噺锛�</div> + <div class="table-container"> + <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border :data="dataForm.technicalList" + stripe> + <el-table-column prop="no" align="center" width="60" label="搴忓彿"> + <template slot-scope="scope"> + <span v-html="indexFormat(scope.$index)"></span> + </template> + </el-table-column> + <el-table-column prop="infoName" min-width="180" label="鎶�鏈祫鏂欏悕绉�"> + <template v-slot="{ row }"> + <el-input v-model="row.name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input> + </template> + </el-table-column> + <el-table-column prop="identify" align="center" width="150" label="鏍囪瘑"> + <template v-slot="{ row }"> + <el-input v-model="row.version" placeholder="鏍囪瘑"></el-input> + </template> + </el-table-column> + <el-table-column prop="version" align="center" width="120" label="鐗堟湰"> + <template v-slot="{ row }"> + <el-input v-model="row.identify" placeholder="鐗堟湰"></el-input> + </template> + </el-table-column> + <el-table-column prop="secretClass" label="瀵嗙骇" width="100" align="center"> + <template v-slot="{ row }"> +<!-- <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>--> + <zt-dict v-model="row.secretClass" dict="secret_class"></zt-dict> + </template> + </el-table-column> + <el-table-column prop="medium" label="浠嬭川" width="100" align="center"> + <template v-slot="{ row }"> + <el-input v-model="row.medium" placeholder="浠嬭川"></el-input> + </template> + </el-table-column> + <el-table-column prop="amount" label="鏁伴噺" width="80" align="center"> + <template v-slot="{ row }"> + <el-input v-model="row.amount" placeholder="鏁伴噺"></el-input> + </template> + </el-table-column> + <el-table-column prop="remark" label="澶囨敞" width="100" align="center"> + <template v-slot="{ row }"> + <el-input v-model="row.remark" placeholder="澶囨敞"></el-input> + </template> + </el-table-column> + <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center"> + <template v-slot="{ row }"> +<!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>--> + <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row" + v-model="row.files"/> + </template> + </el-table-column> + </el-table> + <div class="icon-container" @click="addCirculatRow()"> + <!-- 鏀剧疆鍥哄畾鐨勫浘鏍� --> + <i class="el-icon-plus"></i> + </div> + </div> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鐗╁搧鐨勫叾瀹冭姹� + </div> + <div style="width: calc(100% - 120px);"> + <div class="el-border-left"> + <el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true" + dict="is_or_not"></zt-dict> + </el-form-item> + <el-form-item label="鐗╁搧鐨勫叾浠栬姹傦細" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0"> + <el-input v-model="dataForm.circulatOrder.itemOther"></el-input> + </el-form-item> + </div> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鐗╁搧鎺ユ敹浜� + </div> + <div class="el-border-left-right acceptDate" style="width: 20%;;height: 80px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.itemAccept}} + </el-form-item> + </div> + <div style="width: 52px;text-align: center;font-weight: 600"> + 鏃堕棿 + </div> + <div class="el-border-left-right acceptDate" style="width: 20%;height: 80px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.acceptDate}} + </el-form-item> + </div> + <div style="width: 84px;text-align: center;font-weight: 600"> + 鎯呭喌璇存槑 + </div> + <div class="el-border-left " style="width: 35%;height: 80px;"> + <el-form-item label="鏄惁瀹屾垚鐥呮瘨鏌ユ潃" label-width="150px" style="padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + <el-form-item label="鐥呮瘨搴撶増鏈細" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0"> + <el-input v-model="dataForm.circulatOrder.itemOther"></el-input> + </el-form-item> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鏍″噯/妫�娴嬫帴鏀朵汉 + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.itemAccept}} + </el-form-item> + </div> + <div style="width: 52px;text-align: center;font-weight: 600"> + 鏃堕棿 + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.acceptDate}} + </el-form-item> + </div> + <div style="width: 84px;text-align: center;font-weight: 600"> + 鎯呭喌璇存槑 + </div> + <div class="el-border-left " style="width: 35%;height: 40px;"> + <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.cscs" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鏍″噯妫�娴嬩汉 + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.calibratDetect}} + </el-form-item> + </div> + <div style="width: 52px;text-align: center;font-weight: 600"> + 鏃堕棿 + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.detectDate}} + </el-form-item> + </div> + <div style="width: 84px;text-align: center;font-weight: 600"> + 鎯呭喌璇存槑 + </div> + <div class="el-border-left " style="width: 35%;height: 40px;"> + <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鐗╁搧鍏ュ簱浜� + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.warehouse}} + </el-form-item> + </div> + <div style="width: 52px;text-align: center;font-weight: 600"> + 鏃堕棿 + </div> + <div class="el-border-left-right" style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.warehouseDate}} + </el-form-item> + </div> + <div style="width: 84px;text-align: center;font-weight: 600"> + 鎯呭喌璇存槑 + </div> + <div class="el-border-left " style="width: 35%;height: 40px;"> + <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + </div> + </div> + <div class="el-flexCirculationDialog el-border-bottom"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 鐗╁搧鍙戞斁浜� + </div> + <div class="el-border-left-right " style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.itemIssue}} + </el-form-item> + </div> + <div style="width: 52px;text-align: center;font-weight: 600"> + 鏃堕棿 + </div> + <div class="el-border-left-right " style="width: 20%;height: 40px;"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.issueDate}} + </el-form-item> + </div> + <div style="width: 84px;text-align: center;font-weight: 600"> + 鎯呭喌璇存槑 + </div> + <div class="el-border-left " style="width: 35%;height: 40px;"> + <el-form-item label="鏄惁瀹屾垚鏍峰搧鍙戞斁" label-width="150px" style="padding-left:20px;margin-bottom:0"> + <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + </div> + </div> + <div class="el-flexCirculationDialog"> + <div style="width: 112px;text-align: center;font-weight: 600"> + 澶囨敞 + </div> + <div class="el-border-left " style="width: 20%;height: 40px"> + <el-form-item style="width: 100%;padding-left:20px;margin:0;"> + {{dataForm.circulatOrder.itemAccept}} + </el-form-item> + </div> + </div> +<!-- <div class="circulationContentWidth"> + <el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鎺ユ敹浜�" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.itemAccept" placeholder="鐗╁搧鎺ユ敹浜�"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom" label="鏃堕棿" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.acceptDate" placeholder="鏃堕棿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom" label="鎯呭喌璇存槑" style="width: 32%"> + <span>鏄惁瀹屾垚鐥呮瘨鏌ユ潃锛� + <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict> + </span> + <span>鐥呮瘨搴撶増鏈細<el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="鐥呮瘨搴撶増鏈�"></el-input></span> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鏍″噯妫�娴嬩汉" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.calibratDetect" placeholder="鏍″噯妫�娴嬩汉"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鏃堕棿" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.detectDate" placeholder="鏃堕棿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom3" label="鎯呭喌璇存槑" style="width: 32%"> +<!– <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="鎯呭喌璇存槑"></el-input>–> + <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍏ュ簱浜�" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.warehouse" placeholder="鐗╁搧鍏ュ簱浜�"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.warehouseDate" placeholder="鏃堕棿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%"> +<!– <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="鎯呭喌璇存槑"></el-input>–> + <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍙戞斁浜�" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.itemIssue" placeholder="鐗╁搧鍙戞斁浜�"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%"> + <el-input v-model="dataForm.circulatOrder.issueDate" placeholder="鏃堕棿"></el-input> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%"> +<!– <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="鎯呭喌璇存槑"></el-input>–> + <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict> + </el-form-item> + <el-form-item class="marginTopAndMarginBottom2 lastChild" label="澶囨敞" style="width: 100%"> + <el-input v-model="dataForm.circulatOrder.remark" placeholder="澶囨敞"></el-input> + </el-form-item> + </div>--> + </div> </el-form> </zt-dialog> </template> @@ -65,45 +306,108 @@ return { dataForm: { id: '', - projectId: '', - code: '', - itemRequire: '', - itemOther: '', - itemAccept: '', - acceptDate: '', - acceptSituation: '', - calibratDetect: '', - detectDate: '', - detectSituation: '', - warehouse: '', - warehouseDate: '', - warehouseSituation: '', - itemIssue: '', - issueDate: '', - issueSituation: '', - remark: '', - year: '' + circulatOrder:{ + code: '1', + itemAccept: '', + itemRequire: '', + itemOther:'', + acceptSituation:'', + acceptDate: '', + calibratDetect: '', + detectDate: '', + detectSituation: '', + warehouse: '', + warehouseDate: '', + warehouseSituation: '', + itemIssue: '', + issueDate: '', + issueSituation: '', + remark: '', + }, + project: { + softwareIdentity: '', + softwareName: '', + }, + testAgencyInfo: { + agencyName:'', + }, + technicalList:[] } } }, methods: { + indexFormat(index){ + return index += 1 + }, + init(id,row){ + this.dataForm.id = row.id + this.dataForm.projectId = row.projectId + // this.dataForm.disabled + this.getInfo() + console.log(this.dataForm.id,this.dataForm.projectId,'params params') + }, + addCirculatRow(){ + this.dataForm.technicalList.push({}) + this.$nextTick(()=>{ + const tableBody=this.$refs.tableCirculatOrderList.$el.querySelector('.el-table__body-wrapper') + tableBody.scrollTop = tableBody.scrollHeight; + }) + }, // 鑾峰彇淇℃伅 async getInfo() { - let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`) + let params = { + circulatOrderid: this.dataForm.id, + projectId: this.dataForm.projectId + } + let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`,{params: params}) this.dataForm = { ...this.dataForm, ...res.data } + console.log(this.dataForm,"getInfo this.dataForm") }, // 琛ㄥ崟鎻愪氦 async formSubmit() { + console.log(this.dataForm,"this.dataForm11111") let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/itemCirculatOrder/ItemCirculatOrder/', this.dataForm) if (res.success) { await this.$tip.success() this.$refs.dialog.close() this.$emit('refreshDataList') } + } } } </script> +<style> +.el-flexCirculationDialog{ + display: flex; + align-items: center +} +.circulationContentWidth > .el-form-item > .el-form-item__content { + width: calc(100% - 120px); +} +.circulationContentWidth > .el-form-item.lastChild > .el-form-item__content { + width: calc(100% - 142px); +} +.circulationFormAuto .marginTopAndMarginBottom { + margin-top: 10px !important; + margin-bottom: 0 !important; +} + +.circulationFormAuto .marginTopAndMarginBottom2 { + margin-top: -10px !important; + margin-bottom: 10px !important; +} +.circulationFormAuto .marginTopAndMarginBottom3 { + margin-top: 0 !important; + margin-bottom: 10px !important; +} +.acceptDate> .el-form-item > .el-form-item__content { + line-height: 80px; +} +.circulationFormAuto .el-radio { + margin-right: 10px; +} +</style> -- Gitblit v1.9.1