58582029 by xiaomiao

--no commit message

1 parent f4a7d443
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-04 11:13:36 4 * @LastEditTime: 2023-05-04 11:13:36
5 */ 5 */
6 const state = { 6 const state = {
7 yjsqOptions: "", 7 yjsqOptions: {},
8 } 8 }
9 9
10 const mutations = { 10 const mutations = {
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 watch: { 64 watch: {
65 yjsqOptions: { 65 yjsqOptions: {
66 handler(val) { 66 handler(val) {
67 this.add(val); 67 this.add(val.opinion);
68 }, 68 },
69 deep: true, 69 deep: true,
70 immediate: true, 70 immediate: true,
......
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
102 this.add(""); 102 this.add("");
103 this.monitor=false 103 this.monitor=false
104 }else{ 104 }else{
105 this.add(val); 105 this.add(val.opinion);
106 } 106 }
107 }, 107 },
108 deep: true, 108 deep: true,
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 * @author: renchao 144 * @author: renchao
145 */ 145 */
146 useCommonOpinion (item) { 146 useCommonOpinion (item) {
147 store.dispatch('workflow/setOptions', item.opinion); 147 store.dispatch('workflow/setOptions', item);
148 this.$popupCacel() 148 this.$popupCacel()
149 }, 149 },
150 //删除常用意见 150 //删除常用意见
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
93 watch: { 93 watch: {
94 yjsqOptions: { 94 yjsqOptions: {
95 handler(val) { 95 handler(val) {
96 this.add(val); 96 this.add(val.opinion);
97 }, 97 },
98 deep: true, 98 deep: true,
99 immediate: true, 99 immediate: true,
......
...@@ -107,12 +107,12 @@ ...@@ -107,12 +107,12 @@
107 <el-row :gutter="10" v-if="ruleForm.fdcq1"> 107 <el-row :gutter="10" v-if="ruleForm.fdcq1">
108 <el-col :span="8"> 108 <el-col :span="8">
109 <el-form-item label="独用土地面积:"> 109 <el-form-item label="独用土地面积:">
110 <el-input v-model="ruleForm.fdcq1.dytdmj"></el-input> 110 <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.dytdmj"></el-input>
111 </el-form-item> 111 </el-form-item>
112 </el-col> 112 </el-col>
113 <el-col :span="8"> 113 <el-col :span="8">
114 <el-form-item label="分摊土地面积:"> 114 <el-form-item label="分摊土地面积:">
115 <el-input v-model="ruleForm.fdcq1.fttdmj"></el-input> 115 <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.fttdmj"></el-input>
116 </el-form-item> 116 </el-form-item>
117 </el-col> 117 </el-col>
118 118
...@@ -120,11 +120,12 @@ ...@@ -120,11 +120,12 @@
120 <el-form-item label="房地产交易价格:"> 120 <el-form-item label="房地产交易价格:">
121 <div class="flex"> 121 <div class="flex">
122 <el-input 122 <el-input
123 :disabled="!viewEdit"
123 v-model="ruleForm.fdcq1.fdcjyjg" 124 v-model="ruleForm.fdcq1.fdcjyjg"
124 style="width: 500%" 125 style="width: 500%"
125 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" 126 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
126 ></el-input> 127 ></el-input>
127 <el-select v-model="ruleForm.fdcq1.jedw"> 128 <el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
128 <el-option 129 <el-option
129 v-for="item in dictData['A57']" 130 v-for="item in dictData['A57']"
130 :key="item.dcode" 131 :key="item.dcode"
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
140 <el-col :span="24"> 141 <el-col :span="24">
141 <el-form-item label="附记:"> 142 <el-form-item label="附记:">
142 <el-input 143 <el-input
144 :disabled="!viewEdit"
143 v-model="ruleForm.fdcq1.fj" 145 v-model="ruleForm.fdcq1.fj"
144 type="textarea" 146 type="textarea"
145 maxlength="500" 147 maxlength="500"
......