diff --git a/src/lang/en.js b/src/lang/en.js index 158e0bf..b545326 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -104,6 +104,8 @@ export default { reason: 'Reason', modify: 'Modify', modifyRecord: 'Change Data', + hqz:'Get the value', + xztp:'选择天平', lengthLimit: '长度不能超过', notEmpty: '不能为空', diff --git a/src/lang/zh.js b/src/lang/zh.js index d29d4b0..1bca591 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -100,7 +100,8 @@ export default { reason: '原因', modify: '修改', modifyRecord: '修改记录', - + hqz:'获取值', + xztp:'选择天平', lengthLimit: '长度不能超过', notEmpty: '不能为空', operationSuccess: '操作成功', diff --git a/src/views/business/comps/select/SelectBalanceValue.vue b/src/views/business/comps/select/SelectBalanceValue.vue new file mode 100644 index 0000000..e4f4f2c --- /dev/null +++ b/src/views/business/comps/select/SelectBalanceValue.vue @@ -0,0 +1,64 @@ + + + \ No newline at end of file diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue index a09c13a..edc5576 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue @@ -42,10 +42,7 @@ @@ -125,9 +122,7 @@ - - + @@ -219,10 +214,11 @@ import SelectList from "./SelectList"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectStudy from '@/views/business/comps/select/SelectStudy'; import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; +import SelectBalanceValue from '@/views/business/comps/select/SelectBalanceValue'; export default { name: "Ff", - components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect }, + components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect,SelectBalanceValue }, data() { return { isBatch: false, @@ -401,8 +397,10 @@ export default { this.form.nddw = row.nddw this.form.cctj = row.cctj this.form.ccwz = row.ccwz - this.form.ckl = row.ckl - this.form.ckldw = row.ckldw + this.form.ckl = row.kc + this.form.ckmz = null + this.form.ckmzdw = row.kcdw + this.form.ckldw = row.kcdw this.open = true }, save() { diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue index e027bc6..8181098 100644 --- a/src/views/business/resource/mjy/comps/mjy/Ff.vue +++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue @@ -5,7 +5,7 @@ :close-on-click-modal="false"> -
+
@@ -35,12 +35,9 @@ - + @@ -88,7 +85,7 @@ + }} @@ -109,7 +106,7 @@ + }} @@ -127,9 +124,7 @@ - - - + @@ -152,7 +147,7 @@ - @@ -165,7 +160,7 @@ - @@ -179,7 +174,7 @@ - @@ -192,7 +187,7 @@ - @@ -207,7 +202,8 @@ @@ -221,10 +217,11 @@ import SelectList from "./SelectList"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectStudy from '@/views/business/comps/select/SelectStudy'; import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; +import SelectBalanceValue from '@/views/business/comps/select/SelectBalanceValue'; export default { name: "Ff", - components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect }, + components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect, SelectBalanceValue }, data() { return { isBatch: false, @@ -312,6 +309,9 @@ export default { created() { }, methods: { + getTpValue() { + alert('todo') + }, selectStudyChange(val) { this.form.mdMcs = val.name this.form.mdOther = val.mdOther @@ -407,8 +407,8 @@ export default { this.form.nddw = row.nddw this.form.cctj = row.cctj this.form.ccwz = row.ccwz - this.form.ckl = row.ckl - this.form.ckldw = row.ckldw + this.form.ckl = row.kc + this.form.ckldw = row.kcdw this.open = true }, save() {