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

xiaomiao
Showing 2 changed files with 51 additions and 19 deletions
src/views/workflow/components/clxx/clxxUnify.vue
src/views/workflow/components/dialog/clxxDetailDialog.vue
--- a/src/views/workflow/components/clxx/clxxUnify.vue
View file @17b0ee6
+++ b/src/views/workflow/components/clxx/clxxUnify.vue
View file @17b0ee6
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-31 13:59:45
+ * @LastEditTime: 2023-08-01 09:41:01
 -->
 <template>
  <div class="clxx">
@@ -68,6 +68,16 @@
    created () {
      this.clmlInitList(1)
    },
+    computed: {
+      ...mapGetters(['workFresh'])
+    },
+    watch: {
+      workFresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.clmlInitList(1)
+        }
+      }
+    },
    mounted () {
      this.ableOperation = this.$parent.ableOperation
    },
@@ -254,7 +264,8 @@
      viewDetail () {
        this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", {
          data: this.tableData,
-          unitData: this.$parent.unitData
+          unitData: this.$parent.unitData,
+          ableOperation: this.$parent.ableOperation
        }, "60%")
      },
      //设置tableData
--- a/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @17b0ee6
+++ b/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @17b0ee6
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-31 14:27:07
+ * @LastEditTime: 2023-08-01 10:01:19
 -->
 <template>
  <div class="clmlmx-box">
@@ -10,6 +10,7 @@
    </lb-table>
    <div class="text-center">
      <el-button @click="$popupCacel">取消</el-button>
+      <el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation">确定</el-button>
    </div>
  </div>
 </template>
@@ -56,18 +57,30 @@
            }
          },
          {
-            prop: "sjmc",
            label: "材料名称",
+            render: (h, scope) => {
+              return (
+                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: "80",
+            width: "110",
            render: (h, scope) => {
              return (
-                <div>
+                this.formData.ableOperation ?
-                  <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
+                  <el-select value={scope.row.sjlx}
-                </div>
+                    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>
              )
            }
          },
@@ -127,13 +140,13 @@
          },
          {
            label: "操作",
-            width: "80",
+            width: "100",
            render: (h, scope) => {
              return (
                <div>
                  <el-button
                    type="text"
-                    disabled={scope.$index == 0}
+                    disabled={scope.$index == 0 || !this.formData.ableOperation}
                    onClick={() => {
                      this.moveUpward(scope.$index, scope.row);
                    }}
@@ -142,17 +155,20 @@
                  </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>
-                </div>
+                  <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 >
+              )
+            }
+          }
        ],
        key: 0,
        tableData: []
@@ -161,6 +177,7 @@
    watch: {
      'formData.data': {
        handler: function (val, oldVal) {
+          console.log(val, 'valvalval');
          this.tableData = _.cloneDeep(val)
        },
        immediate: true,
@@ -168,6 +185,12 @@
      }
    },
    methods: {
+      handleSubmit () {
+        // saveClml(this.tableData).then(res => {
+        //   console.log(res, '11111111111111');
+        // })
+        //  store.dispatch('user/reWorkFresh', true)
+      },
      /**
       * @description: 材料目录明细初始化
       * @author: renchao
@@ -187,7 +210,6 @@
              } else {
                this.tableData = []
              }
-              console.log(this.tableData, 'this.tableData');
            } else {
              this.$message.error(res.message)
            }
@@ -248,7 +270,6 @@
          }
        })
      },
-      // 材料目录删除
      /**
       * @description: 材料目录删除
       * @param {*} index
@@ -268,7 +289,7 @@
              if (res == 200) {
                that.$message({
                  message: "删除成功",
-                  type: "success",
+                  type: "success"
                })
              }
            }