Browse Source

feat:[模板管理][update]

master
luojie 2 hours ago
parent
commit
41ab43fa0e
5 changed files with 28 additions and 7 deletions
  1. +4
    -0
      src/components/Template/HandleFormItem.vue
  2. +12
    -4
      src/views/business/comps/template/TemplateTable.vue
  3. +4
    -1
      src/views/business/comps/template/mixins/templateMixin.js
  4. +4
    -1
      src/views/business/study/comp/tbbd/Bj.vue
  5. +4
    -1
      src/views/business/study/comp/tbbd/Fh.vue

+ 4
- 0
src/components/Template/HandleFormItem.vue View File

@ -77,6 +77,7 @@ import Question from "./icons/Question.vue";
import DecimalInput from "./DecimalInput.vue";
import { EventBus } from "@/utils/eventBus"
export default {
inject: ['templateFillType'],
components: {
Question,
DecimalInput
@ -155,6 +156,8 @@ export default {
},
//
onCheckboxChange(val) {
const {templateStatus} = this.$store.state.template;
console.log(this.templateFillType,"templateStatus")
//
EventBus.$emit('onModifyRecord', {
timestamp: new Date().toLocaleString(),
@ -263,6 +266,7 @@ export default {
isShowHandle() {
const { fillType } = this.item;
const { templateStatus } = this.$store.state.template;
return true;
//qc
return (templateStatus === "qc" || templateStatus === "actFill") && fillType === "actFill";
},

+ 12
- 4
src/views/business/comps/template/TemplateTable.vue View File

@ -16,7 +16,6 @@ import SWYPFXCBYPZB from "./comps/sp/SWYPFXCBYPZB.vue";
import SWYPBQGZYZBB from "./comps/sp/SWYPBQGZYZBB.vue";
import SWYPNBGZYZBB from "./comps/sp/SWYPNBGZYZBB.vue";
import Demo from "./comps/sp/Demo.vue";
import IndexDBDemo from "./comps/sp/IndexDBDemo.vue";
//
import SYWZPZJHB from "./comps/gy/SYWZPZJHB.vue";
import MJYLQSQD from "./comps/gy/MJYLQSQD.vue";
@ -25,7 +24,7 @@ export default {
name: "TemplateTable",
components: {
MJYLQSQD, SYWZPZJHB,
SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB, IndexDBDemo
SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB
},
props: {
sn: {
@ -40,6 +39,10 @@ export default {
type: Object,
default: () => { },
},
emitName: {
type: String,
default: 'onModifyRecord',
},
},
computed: {
@ -52,7 +55,6 @@ export default {
'SP004': 'SWYPNBGZYZBB',
'SYWZPZJHB': 'SYWZPZJHB',
'MJYLQSQD': 'MJYLQSQD',
// 'SP001': 'IndexDBDemo',
}
}
return this.componentMap || "Demo"
@ -66,6 +68,12 @@ export default {
}
}
},
provide() {
return {
//fillType
templateFillType: this.fillType,
}
},
data() {
return {
info: {},
@ -73,7 +81,7 @@ export default {
},
mounted() {
EventBus.$on('onModifyRecord', (data) => {
this.$emit("onModifyRecord", data)
this.$emit(this.emitName, data)
})
},
beforeDestroy() {

+ 4
- 1
src/views/business/comps/template/mixins/templateMixin.js View File

@ -43,7 +43,9 @@ export default {
this.setTemplateData({});
},
methods: {
getResource() {
return this.resource;
},
//根据ref数组获取直接formData
getFilledFormDataByRefs(refArr = []){
let result = {};
@ -140,6 +142,7 @@ export default {
}
}
},
//计算并更新实际目标溶液浓度 先计算实际目标溶液体积再计算实际目标溶液浓度
updateSjmbrynd(item,targetAcSolution){
//实际源溶液浓度÷(实际终体积÷源溶液加入体积);

+ 4
- 1
src/views/business/study/comp/tbbd/Bj.vue View File

@ -76,7 +76,7 @@
</el-form>
</div>
<div class="content" v-if="showIndex == 2">
<TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
<TemplateTable emitName="onEditCallback" @onEditCallback="onEditCallback" ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
</div>
</div>
</div>
@ -296,6 +296,9 @@ export default {
this.getInfo()
},
methods: {
onEditCallback(data) {
console.log(data,"onEditCallback")
},
delcc(index) {
this.cclist.splice(index, 1)
},

+ 4
- 1
src/views/business/study/comp/tbbd/Fh.vue View File

@ -20,7 +20,7 @@
</div>
<div class="edit-content">
<div class="content-left">
<TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="qc" />
<TemplateTable emitName="onFhCallback" @onFhCallback = "onFhCallback" ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="qc" />
<div class="content-title">
<div class="line"></div>
<div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
@ -161,6 +161,9 @@ export default {
created() {
},
methods: {
onFhCallback(data) {
console.log(data,"onFhCallback")
},
getJjcgjList(val) {
this.$modal.loading()
studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {

Loading…
Cancel
Save