Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-01 09:43:19
+ * @LastEditTime: 2023-08-01 10:01:19
 -->
 <template>
   <div class="clmlmx-box">
@@ -57,30 +57,30 @@
             }
           },
           {
-            prop: "sjmc",
             label: "材料名称",
             render: (h, scope) => {
               return (
-                <el-input value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+                this.formData.ableOperation ?
+                  <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
               )
             }
           },
           {
-            prop: "sjlx",
             label: "材料类型",
             width: "110",
             render: (h, scope) => {
               return (
-                <el-select value={scope.row[scope.column.property]}
-                  onChange={(val) => { scope.row[scope.column.property] = val }}>
-                  {
-                    store.getters.dictData['A40'].map(option => {
-                      return (
-                        <el-option label={option.dname} value={option.dcode}></el-option>
-                      )
-                    })
-                  }
-                </el-select>
+                this.formData.ableOperation ?
+                  <el-select value={scope.row.sjlx}
+                    onChange={(val) => { scope.row.sjlx = val }}>
+                    {
+                      store.getters.dictData['A40'].map(option => {
+                        return (
+                          <el-option label={option.dname} value={option.dcode}></el-option>
+                        )
+                      })
+                    }
+                  </el-select> : <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
               )
             }
           },
@@ -146,7 +146,7 @@
                 <div>
                   <el-button
                     type="text"
-                    disabled={scope.$index == 0}
+                    disabled={scope.$index == 0 || !this.formData.ableOperation}
                     onClick={() => {
                       this.moveUpward(scope.$index, scope.row);
                     }}
@@ -155,14 +155,14 @@
                   </el-button>
                   <el-button
                     type="text"
-                    disabled={scope.$index + 1 == this.tableData.length}
+                    disabled={scope.$index + 1 == this.tableData.length || !this.formData.ableOperation}
                     onClick={() => {
                       this.moveDown(scope.$index, scope.row);
                     }}
                   >
                     下移
                   </el-button>
-                  <i v-show={scope.row.isrequired != '1' && formData.ableOperation} onClick={() => {
+                  <i v-show={scope.row.isrequired != '1' && this.formData.ableOperation} onClick={() => {
                     this.handleDelete(scope.$index, scope.row);
                   }} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
                 </div >
@@ -177,6 +177,7 @@
     watch: {
       'formData.data': {
         handler: function (val, oldVal) {
+          console.log(val, 'valvalval');
           this.tableData = _.cloneDeep(val)
         },
         immediate: true,