Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-05-04 11:13:36
  */
 const state = {
-  yjsqOptions: "",
+  yjsqOptions: {},
 }
 
 const mutations = {

@@ -64,7 +64,7 @@ export default {
  watch: {
     yjsqOptions: {
       handler(val) {
-        this.add(val);
+      this.add(val.opinion);
       },
       deep: true,
       immediate: true,

@@ -102,7 +102,7 @@ export default {
           this.add("");
           this.monitor=false
         }else{
-          this.add(val);
+          this.add(val.opinion);
         }
       },
       deep: true,

@@ -144,7 +144,7 @@
        * @author: renchao
        */
       useCommonOpinion (item) {
-        store.dispatch('workflow/setOptions', item.opinion);
+        store.dispatch('workflow/setOptions', item);
         this.$popupCacel()
       },
       //删除常用意见

@@ -93,7 +93,7 @@ export default {
   watch: {
     yjsqOptions: {
       handler(val) {
-        this.add(val);
+        this.add(val.opinion);
       },
       deep: true,
       immediate: true,

@@ -107,12 +107,12 @@
         <el-row :gutter="10" v-if="ruleForm.fdcq1">
           <el-col :span="8">
             <el-form-item label="独用土地面积：">
-              <el-input v-model="ruleForm.fdcq1.dytdmj"></el-input>
+              <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.dytdmj"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="分摊土地面积：">
-              <el-input v-model="ruleForm.fdcq1.fttdmj"></el-input>
+              <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.fttdmj"></el-input>
             </el-form-item>
           </el-col>
 
@@ -120,11 +120,12 @@
             <el-form-item label="房地产交易价格：">
               <div class="flex">
                 <el-input
+                 :disabled="!viewEdit"
                   v-model="ruleForm.fdcq1.fdcjyjg"
                   style="width: 500%"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
                 ></el-input>
-                <el-select v-model="ruleForm.fdcq1.jedw">
+                <el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
                   <el-option
                     v-for="item in dictData['A57']"
                     :key="item.dcode"
@@ -140,6 +141,7 @@
           <el-col :span="24">
             <el-form-item label="附记：">
               <el-input
+               :disabled="!viewEdit"
                 v-model="ruleForm.fdcq1.fj"
                 type="textarea"
                 maxlength="500"