diff --git a/src/api/system/user.js b/src/api/system/user.js index a70db33..871d381 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -164,3 +164,12 @@ export function roleChangeList(query) { params: query }) } + +// 查询用户 +export function checkExist(query) { + return request({ + url: '/system/user/checkExist', + method: 'get', + params: query + }) +} diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index 40c4ebf..842239a 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -224,6 +224,7 @@
@@ -240,6 +241,7 @@
@@ -1022,8 +1024,7 @@ export default { this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource)); this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data }; this.localDataSource = [...this.localDataSource]; - console.log(signData,"signData") - if(signData && signData.remark){ + if(updateFields.length > 0){ updateFields.map((key)=>{ const ref = this.$refs[key+rowIndex]; if(ref){ diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 096ac34..115c85a 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -340,9 +340,9 @@ export default { currentCheckboxTreeValue: '',//当前操作的checkboxTree值 isShowOtherByCheckboxTree, pickerOptions: { - disabledDate(time) { - return time.getTime() > Date.now(); - }, + // disabledDate(time) { + // return time.getTime() > Date.now(); + // }, shortcuts: type === 'dateTimeRange' ? undefined:[{ text: '今天', onClick(picker) { @@ -524,7 +524,7 @@ export default { // 所有删除操作都需要验证电子签名 // 保存待删除的文件信息 this.pendingRemoveFile = { file, fileList: this.fileList }; - +console.log("fillll") // 触发电子签名弹窗 EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); @@ -1200,8 +1200,9 @@ export default { return; } if (!isOldValueEmpty && !(isSame) && (this.templateFillType === "actFill" || this.templateFillType === "blxjsh")&&this.type !== "attachment") { + console.log("需要电子签名") // 通过EventBus触发电子签名弹窗 - EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); + // EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); } else {//如果是第一次填写,不需要密码验证 this.handleUpdateRecord() } @@ -1243,7 +1244,8 @@ export default { //处理更新记录 handleUpdateRecord(data, recordData) { const baseInfo = this.getCommonRecordInfo(); - if (!this.oldValue && !this.inputValue) { + //有recordData表示从组件外部调用的更新操作, + if (!this.oldValue && !this.inputValue && !recordData) { return } let finallyKey = this.fieldKey; diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index bc7446d..b0070bb 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -193,6 +193,7 @@ import xfzzysjg from './StepComponents/pcr/xfzzysjg.vue';//PCR-吸附柱转移 import xfzzylxg from './StepComponents/pcr/xfzzylxg.vue';//PCR-吸附柱转移(离心管) import xt from './StepComponents/pcr/xt.vue';//PCR-洗脱 import ecxt from './StepComponents/pcr/ecxt.vue';//PCR-二次洗脱 +import lx_pcr from './StepComponents/pcr/lx.vue';//PCR-离心 //PCR分析核酸提取浓度测定表 @@ -491,6 +492,7 @@ export default { xfzzylxg, xt, ecxt, + lx_pcr, //PCR分析核酸提取浓度测定表 ndcd, @@ -726,6 +728,7 @@ export default { 'xfzzylxg':'xfzzylxg', 'xt':'xt', 'ecxt':'ecxt', + 'lx_pcr':'lx_pcr', //PCR分析核酸提取浓度测定表 'ndcd':'ndcd', diff --git a/src/components/Template/StepComponents/pcr/hsypfz.vue b/src/components/Template/StepComponents/pcr/hsypfz.vue index 7a6ca2a..69f5b7c 100644 --- a/src/components/Template/StepComponents/pcr/hsypfz.vue +++ b/src/components/Template/StepComponents/pcr/hsypfz.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue index 2486dcb..f4aad70 100644 --- a/src/components/Template/StepComponents/ry/jd.vue +++ b/src/components/Template/StepComponents/ry/jd.vue @@ -1,6 +1,7 @@ @@ -16,9 +17,18 @@ export default { default: 'jd', }, }, + components: { StepFormPackage }, + methods: { + select(data) { + const {value,key} = data; + if(key==='sjccwz'){ + this.updateWcData("sjwd",value); + } + } + }, computed: { formConfig() { let config = this.sn==='jd_swypfx'? @@ -29,8 +39,8 @@ export default { type: "text", }, ccwz: { - type: "select", - options: this.getDictOptions("business_ccwz"), + type: "input", + // options: this.getDictOptions("business_ccwz"), fillType: "preFill", otherCode: "ccwzOther", }, @@ -142,8 +152,8 @@ export default { type: "text", }, ccwz: { - type: "select", - options: this.getDictOptions("business_ccwz"), + type: "input", + // options: this.getDictOptions("business_ccwz"), fillType: "preFill", otherCode: "ccwzOther", }, diff --git a/src/components/Template/StepComponents/xb/bpqr.vue b/src/components/Template/StepComponents/xb/bpqr.vue index d874c15..4785a9e 100644 --- a/src/components/Template/StepComponents/xb/bpqr.vue +++ b/src/components/Template/StepComponents/xb/bpqr.vue @@ -1,6 +1,6 @@ diff --git a/src/views/business/storageLocation/comps/Xz.vue b/src/views/business/storageLocation/comps/Xz.vue new file mode 100644 index 0000000..216e654 --- /dev/null +++ b/src/views/business/storageLocation/comps/Xz.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue index 330fc80..fdc0748 100644 --- a/src/views/business/storageLocation/list.vue +++ b/src/views/business/storageLocation/list.vue @@ -11,8 +11,9 @@ - - + + @@ -56,111 +57,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
- -
- - + + + diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index 82703da..9f4ef24 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -73,7 +73,7 @@ -
+
@@ -113,7 +113,7 @@
-
diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue index dad7c50..84676fd 100644 --- a/src/views/business/study/comp/jhbd/Fh.vue +++ b/src/views/business/study/comp/jhbd/Fh.vue @@ -57,7 +57,7 @@ -
+
@@ -95,7 +95,7 @@ - diff --git a/src/views/business/study/comp/jhbd/Ghgsr.vue b/src/views/business/study/comp/jhbd/Ghgsr.vue index ed35302..c36ac26 100644 --- a/src/views/business/study/comp/jhbd/Ghgsr.vue +++ b/src/views/business/study/comp/jhbd/Ghgsr.vue @@ -3,7 +3,7 @@ -
+
@@ -32,7 +32,7 @@ - diff --git a/src/views/business/study/comp/jhbd/Sy.vue b/src/views/business/study/comp/jhbd/Sy.vue index 0ace067..7e43dc9 100644 --- a/src/views/business/study/comp/jhbd/Sy.vue +++ b/src/views/business/study/comp/jhbd/Sy.vue @@ -53,7 +53,7 @@ -
+
@@ -82,7 +82,7 @@ - diff --git a/src/views/business/study/comp/jhbd/Xq.vue b/src/views/business/study/comp/jhbd/Xq.vue index 2a26334..3ac9fff 100644 --- a/src/views/business/study/comp/jhbd/Xq.vue +++ b/src/views/business/study/comp/jhbd/Xq.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue index 7e28456..7ba8601 100644 --- a/src/views/business/study/comp/sign.vue +++ b/src/views/business/study/comp/sign.vue @@ -45,7 +45,7 @@
- +
@@ -114,7 +114,7 @@ export default { startDate:selectedDate&&selectedDate.length>0?selectedDate[0]:'', endDate:selectedDate&&selectedDate.length>1?selectedDate[1]:'' } - this.resetForm("signForm") + this.open = true this.isReson = isReson || false @@ -150,6 +150,8 @@ export default { }] } } + + this.clearFormValidate("signForm") }, cancel() { this.open = false diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 94567ea..53a9280 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -83,7 +83,7 @@ -
+
@@ -113,7 +113,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Fh.vue b/src/views/business/study/comp/sqbd/Fh.vue index b00dd00..954789c 100644 --- a/src/views/business/study/comp/sqbd/Fh.vue +++ b/src/views/business/study/comp/sqbd/Fh.vue @@ -57,7 +57,7 @@ -
+
@@ -96,7 +96,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Fz.vue b/src/views/business/study/comp/sqbd/Fz.vue index f4a8192..152af09 100644 --- a/src/views/business/study/comp/sqbd/Fz.vue +++ b/src/views/business/study/comp/sqbd/Fz.vue @@ -3,7 +3,7 @@ -
+
@@ -33,7 +33,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Ghgsr.vue b/src/views/business/study/comp/sqbd/Ghgsr.vue index 19436e1..2558f83 100644 --- a/src/views/business/study/comp/sqbd/Ghgsr.vue +++ b/src/views/business/study/comp/sqbd/Ghgsr.vue @@ -3,7 +3,7 @@ -
+
@@ -33,7 +33,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Jq.vue b/src/views/business/study/comp/sqbd/Jq.vue index a456dea..b03974d 100644 --- a/src/views/business/study/comp/sqbd/Jq.vue +++ b/src/views/business/study/comp/sqbd/Jq.vue @@ -3,7 +3,7 @@ -
+
@@ -37,7 +37,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Qrfz.vue b/src/views/business/study/comp/sqbd/Qrfz.vue index 83e8d1d..3206d9d 100644 --- a/src/views/business/study/comp/sqbd/Qrfz.vue +++ b/src/views/business/study/comp/sqbd/Qrfz.vue @@ -3,7 +3,7 @@ -
+
@@ -33,7 +33,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Sh.vue b/src/views/business/study/comp/sqbd/Sh.vue index 902a8dc..7458800 100644 --- a/src/views/business/study/comp/sqbd/Sh.vue +++ b/src/views/business/study/comp/sqbd/Sh.vue @@ -55,7 +55,7 @@ -
+
@@ -94,7 +94,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Sy.vue b/src/views/business/study/comp/sqbd/Sy.vue index 7c8bc07..fb3e087 100644 --- a/src/views/business/study/comp/sqbd/Sy.vue +++ b/src/views/business/study/comp/sqbd/Sy.vue @@ -54,7 +54,7 @@ -
+
@@ -84,7 +84,7 @@
-
diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue index c406bf5..ac897aa 100644 --- a/src/views/business/study/comp/sqbd/Xq.vue +++ b/src/views/business/study/comp/sqbd/Xq.vue @@ -135,7 +135,7 @@ - diff --git a/src/views/business/study/comp/syff/Xz.vue b/src/views/business/study/comp/syff/Xz.vue index 18213e1..85c5505 100644 --- a/src/views/business/study/comp/syff/Xz.vue +++ b/src/views/business/study/comp/syff/Xz.vue @@ -4,7 +4,7 @@ G