cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -18,6 +18,7 @@ modules = {
     // readonly: Boolean,
     otherFlag:Boolean,
     hData: Object,
+    compareHData: Object,
   },
   components: {
     formOplogTable,
@@ -50,6 +51,23 @@ modules = {
         taBm: null,
         sszstBm: null,
       },
+      oldSzTaMb: {
+        enabled: true,
+        taType: 0,
+        szTaZdMbDTOs: [],
+        menuKindName: null,
+        menuKindCode: null,
+        serviceName: null,
+        taRule: 0,
+        dataRange: 0,
+        szTaMbTagDTOs: [],
+        fromTable: false,
+        taCh: null,
+        sszstEn: null,
+        taEn: null,
+        taBm: null,
+        sszstBm: null,
+      },
       treeDefaultZds: [],
       productOption: {},
       showSzTaMbDialog: false,
@@ -93,7 +111,30 @@ modules = {
       sid: null,
       showOtherAuthDialog:false,
 
+      zdTypeMap: {
+        Boolean: "布尔",
+        Integer: "整数",
+        Long: "长整数",
+        Decimal: "精度小数",
+        Money: "金额",
+        Text: "文本",
+        TextArea: "长文本",
+        DateTime: "日期时间",
+        Reference: "关联表",
+      },
+
+      treeFlagMap:{
+        name: "名称",
+        wbs: "WBS码",
+        parent: "上级ID",
+        treePath: "树ID路径",
+        treePathName: "树名称路径",
+        hasChild: "是否有下级",
+        grade: "层级",
+      },
+
       readonly: false,
+      isCompare: false,
     };
   },
   computed: {
@@ -163,6 +204,16 @@ modules = {
         this.szTaMb = this.$baseLodash.cloneDeep(this.hData);
         this.dataId = this.hData.id
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
+        this.getCreatedTableColumns();
+        if (this.compareHData && this.$attrs.isCompare) {
+          this.oldSzTaMb = this.$baseLodash.cloneDeep(this.compareHData);
+          let oldSzTaZdMbDTOs = this.$baseLodash.cloneDeep(this.compareHData.szTaZdMbDTOs) || [];
+          this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
+            let oldItem = oldSzTaZdMbDTOs.find((pItem) => pItem.zdEn === item.zdEn);
+            item.hData = oldItem || {};
+          })
+          this.isCompare = true;
+        }
       } else {
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
       }
@@ -267,22 +318,6 @@ modules = {
             fixed: "left",
             slots: {
               default: "zdEn",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                if (!disabled) {
-                  return [
-                    <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdEn'}
-                                  rules={[{required: true, trigger: ['blur', 'change']}]}>
-                      <el-input v-model={row.zdEn} clearable/>
-                    </el-form-item>
-                  ];
-                } else {
-                  let style = !!row.relationZd ? "margin-left:20px" : "";
-                  return [
-                    <div style={style}>{row.zdEn}</div>
-                  ]
-                }
-              }*/
             },
           },
           {
@@ -299,9 +334,23 @@ modules = {
               default: ({row, rowIndex, $table}) => {
                 let taZdMc = row.taZdMc;
                 let createdTableColumnArray = this.createdTableColumnArray;
-                return taZdMc && createdTableColumnArray.includes(taZdMc)
+                let oldResult = createdTableColumnArray.includes(row?.hData?.taZdMc)
+                  ? "是"
+                  : "_";
+                let result = taZdMc && createdTableColumnArray.includes(taZdMc)
                   ? "是"
                   : "_";
+                  return [
+                    <el-form-item>
+                      <fieldCompare
+                        isCompare={this.isCompare}
+                        oldVal={oldResult}
+                        newVal={result}
+                      >
+                        {result}
+                      </fieldCompare>
+                    </el-form-item>
+                  ]
               },
             },
           },
@@ -311,14 +360,6 @@ modules = {
             width: 150,
             slots: {
               default: "zdCh",
-              /*default: ({row, rowIndex, $table}) => {
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdCh'}
-                                rules={[{required: true, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.zdCh} clearable disabled={!!row.systems}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -377,15 +418,6 @@ modules = {
             width: 200,
             slots: {
               default: "zdTypeValues",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdTypeValues'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.zdTypeValues} clearable disabled={disabled}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -399,12 +431,6 @@ modules = {
             },
             slots: {
               default: "required",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.required} disabled={disabled}/>
-                ];
-              }*/
             },
           },
           {
@@ -418,12 +444,6 @@ modules = {
             },
             slots: {
               default: "enabled",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.enabled} disabled={disabled}/>
-                ];
-              }*/
             },
           },
 
@@ -438,12 +458,6 @@ modules = {
             },
             slots: {
               default: "generateCode",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.generateCode} disabled={disabled}/>
-                ];
-              }*/
             },
           },
           {
@@ -478,15 +492,6 @@ modules = {
             width: 150,
             slots: {
               default: "codeType",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.codeType'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.codeType} clearable disabled={disabled}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -495,16 +500,6 @@ modules = {
             width: 150,
             slots: {
               default: "orders",
-              /*default: ({row, rowIndex, $table}) => {
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.orders'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <base-input-number v-model={row.orders} disabled={!!row.systems} onchange={() => {
-                      this.changeOrders(row);
-                    }}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -534,6 +529,11 @@ modules = {
             },
           },
         ],
+        config:{
+          // rowConfig:{
+          //   height: 60,
+          // }
+        }
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.productOption = opts;
@@ -1242,7 +1242,22 @@ modules = {
     },
     excelExport(){
       this.$excelExport({title: '数据表字段明细导出', targetRef: 'table-szTaZdMb', prefix: USER_PREFIX, type: 'selected'})
-    }
+    },
+    getHValue(row, column) {
+      if (row.hData && row.hData.id) {
+        let result = row.hData[column.property];
+        if(column.property == 'zdType'){
+          result = this.zdTypeMap[result]
+        }else if(column.property == 'treeFlag'){
+          result = this.treeFlagMap[result]
+        }
+        return result
+      }/*  else if (!row?.hData?.id) {
+        return "HAS_NO_HDATA";
+      } */ else {
+        return null;
+      }
+    },
   },
 };
 export default modules;