From 7ccaedfbf09332301c182982921146377d140b2b Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 23 Mar 2026 11:24:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20YP005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/dl/DL023.vue | 4 +-- .../business/comps/template/comps/yp/YP002.vue | 2 +- .../business/comps/template/comps/yp/YP005.vue | 33 ++++++++++++++++++++-- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue index ab14c55..267a79f 100644 --- a/src/views/business/comps/template/comps/dl/DL023.vue +++ b/src/views/business/comps/template/comps/dl/DL023.vue @@ -189,7 +189,7 @@ export default { subKey: 'zskssj', buttonName: 'template.dl.dl023.ksButton', disabled: true, - subDisabled: false + subDisabled: this.fillType !== 'actFill' }, zsjssj: { label: 'template.dl.dl023.zsjssj', @@ -200,7 +200,7 @@ export default { subKey: 'zsjssj', buttonName: 'template.dl.dl023.jsButton', disabled: true, - subDisabled: false + subDisabled: this.fillType !== 'actFill' }, } } diff --git a/src/views/business/comps/template/comps/yp/YP002.vue b/src/views/business/comps/template/comps/yp/YP002.vue index cf90f0b..7a6a875 100644 --- a/src/views/business/comps/template/comps/yp/YP002.vue +++ b/src/views/business/comps/template/comps/yp/YP002.vue @@ -143,7 +143,7 @@ export default { subKey:"jssjButton", buttonName:"template.yp.yp002.hqsj", disabled:true, - subDisabled:false + subDisabled:this.fillType !== 'actFill' }, } }, diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue index f336e57..4098387 100644 --- a/src/views/business/comps/template/comps/yp/YP005.vue +++ b/src/views/business/comps/template/comps/yp/YP005.vue @@ -178,7 +178,7 @@ export default { bodyThirdFillType:"actFill", width: 280, bodyDisabled:true, - bodySubDisabled:false, + bodySubDisabled:this.fillType !== 'actFill', }] }, }, @@ -198,8 +198,37 @@ export default { this.$refs.ImportExcelDialog.show() } if(key === "startBtn"){ + debugger + let startTime = moment().format("YYYY/MM/DD HH:mm") + let content = this.getFilledFormData(); + let tableList = content.stepTableFormData + let qxsj = tableList[rowIndex].qxsj + let timeArr = qxsj?qxsj.split('~'):['',''] + timeArr[0] = startTime this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{ - qxsj: moment().format("YYYY/MM/DD HH:mm"), + qxsj: timeArr.join('~'), + }) + + // this.$nextTick(() => { + // //通知后端保存数据 + // const params = { + // type: "fieldChanged", + // newRecord: null, + // resourceList: null, + // } + // EventBus.$emit('onModifyRecord', params,) + // }) + } + if(key === "endBtn"){ + debugger + let endTime = moment().format("YYYY/MM/DD HH:mm") + let content = this.getFilledFormData(); + let tableList = content.stepTableFormData + let qxsj = tableList[rowIndex].qxsj + let timeArr = qxsj?qxsj.split('~'):['',''] + timeArr[1] = endTime + this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{ + qxsj: timeArr.join('~'), }) // this.$nextTick(() => { From 52f96d632b75e0d5981305993a46bfd492d5421c Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 23 Mar 2026 11:34:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20yp005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/yp/YP005.vue | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue index 4098387..c581be3 100644 --- a/src/views/business/comps/template/comps/yp/YP005.vue +++ b/src/views/business/comps/template/comps/yp/YP005.vue @@ -193,17 +193,16 @@ export default { methods: { // 点击按钮 handleClickButton(key,rowIndex,colIndex,e,data){ + let content = this.getFilledFormData(); + let tableList = content.stepTableFormData + let qxsj = tableList[rowIndex].qxsj + let timeArr = qxsj?qxsj.split('~'):['',''] if(key === "exportBtn"){ this.currentRowIndex = rowIndex; this.$refs.ImportExcelDialog.show() } if(key === "startBtn"){ - debugger let startTime = moment().format("YYYY/MM/DD HH:mm") - let content = this.getFilledFormData(); - let tableList = content.stepTableFormData - let qxsj = tableList[rowIndex].qxsj - let timeArr = qxsj?qxsj.split('~'):['',''] timeArr[0] = startTime this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{ qxsj: timeArr.join('~'), @@ -222,10 +221,6 @@ export default { if(key === "endBtn"){ debugger let endTime = moment().format("YYYY/MM/DD HH:mm") - let content = this.getFilledFormData(); - let tableList = content.stepTableFormData - let qxsj = tableList[rowIndex].qxsj - let timeArr = qxsj?qxsj.split('~'):['',''] timeArr[1] = endTime this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{ qxsj: timeArr.join('~'), From 951cf19b7b256838653423c23ecf5717df22ad34 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Mon, 23 Mar 2026 15:05:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:[=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/storageLocation/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue index 672f62f..e2d8c42 100644 --- a/src/views/business/storageLocation/list.vue +++ b/src/views/business/storageLocation/list.vue @@ -130,7 +130,7 @@ diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue index e2d8c42..330fc80 100644 --- a/src/views/business/storageLocation/list.vue +++ b/src/views/business/storageLocation/list.vue @@ -114,7 +114,8 @@ - + @@ -126,6 +127,7 @@ + @@ -136,9 +138,10 @@ import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; import SelectDept from '@/views/business/comps/select/SelectDept'; import { mapGetters } from 'vuex' import SelectStorageLocation from '@/views/business/comps/select/SelectStorageLocation' +import StorageLocationDetail from './comps/detail' export default { name: 'StorageLocation', - components: { BusinessSelect, SelectDept, SelectStorageLocation }, + components: { BusinessSelect, SelectDept, SelectStorageLocation, StorageLocationDetail }, data() { return { @@ -170,7 +173,8 @@ export default { }, // 表单参数 form: { - 'qmyy': this.$t('page.form.add') + 'qmyy': this.$t('page.form.add'), + qmrmm: null, }, // 表单校验 rules: { @@ -238,6 +242,7 @@ export default { wc: null, ccwz: null, fzdd: null, + qmrmm: null, qmyy: this.$t('page.system.storageLocation.addStroageLocation'), } this.resetForm('form') @@ -269,7 +274,7 @@ export default { this.title = this.$t('form.edit') }, handleDetail(row) { - this.$refs.YqDetail.show(row) + this.$refs.storageLocationDetail.show(row) }, /** 提交按钮 */ submitForm() { From f97b0fa0958ee05358692641b99956271afaf8be Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 23 Mar 2026 16:11:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=A7=A3=E5=86=BB=E7=9B=B8=E5=85=B3=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E7=9A=84=E6=B8=A9=E5=BA=A6=E6=94=B9=E6=88=90=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/StepComponents/qxwdx/qxjz.vue | 10 +--------- src/components/Template/StepComponents/ry/jd.vue | 12 ++++++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/components/Template/StepComponents/qxwdx/qxjz.vue b/src/components/Template/StepComponents/qxwdx/qxjz.vue index 85b3735..c80c673 100644 --- a/src/components/Template/StepComponents/qxwdx/qxjz.vue +++ b/src/components/Template/StepComponents/qxwdx/qxjz.vue @@ -66,7 +66,7 @@ export default { compareTo: "yjhj", }, text6: { - label: this.sn==='qxqy'?"条件下暂存至":"条件下静置，即稳定性", + label: this.sn==='qxqy'?"条件下暂存，作为":"条件下静置，即稳定性", type: "text", }, } @@ -93,14 +93,6 @@ export default { fillType: "actFill", otherCode: "ccwzOther", } - config[0].config.text8 = { - type: "text", - label: "作为", - } - config[0].config.yp = { - type: "input", - fillType: "actFill", - } config[0].config.text9 = { type: "text", label: "样品。", diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue index 67c1ad0..2486dcb 100644 --- a/src/components/Template/StepComponents/ry/jd.vue +++ b/src/components/Template/StepComponents/ry/jd.vue @@ -51,7 +51,8 @@ export default { }, yjwd: { type: "select", - options: this.getDictOptions("business_wddw"), + options: this.getDictOptions("business_cctj"), + multiple: true, fillType: "preFill", otherCode: "yjwdOther", }, @@ -67,7 +68,8 @@ export default { }, sjwd: { type: "select", - options: this.getDictOptions("business_wddw"), + options: this.getDictOptions("business_cctj"), + multiple: true, fillType: "actFill", otherCode: "sjwdOther", compareTo: "yjwd", @@ -162,7 +164,8 @@ export default { }, yjwd: { type: "select", - options: this.getDictOptions("business_wddw"), + options: this.getDictOptions("business_cctj"), + multiple: true, fillType: "preFill", otherCode: "yjwdOther", }, @@ -178,7 +181,8 @@ export default { }, sjwd: { type: "select", - options: this.getDictOptions("business_wddw"), + options: this.getDictOptions("business_cctj"), + multiple: true, fillType: "actFill", otherCode: "sjwdOther", compareTo: "yjwd",