cloud-web-corejs 1.0.54-dev.138 → 1.0.54-dev.139

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.138",
+  "version": "1.0.54-dev.139",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/table_model/edit.vue

@@ -441,6 +441,7 @@
                     clearable
                     @clear="$forceUpdate()"
                     v-el-readonly
+                    :disabled="!!row.systems || !!row.relationZd"
                   >
                     <i
                       slot="suffix"
@@ -449,6 +450,21 @@
                     ></i>
                   </el-input>
                 </template>
+                <template #treeFlag="{ row }">
+                  <el-select
+                    v-model="row.treeFlag"
+                    clearable
+                    :disabled="!!row.systems || !!row.relationZd || szTaMb.taRule!==1"
+                  >
+                    <el-option value="name" :label="$t1('名称')"></el-option>
+                    <el-option value="wbs" :label="$t1('WBS码')"></el-option>
+                    <el-option value="parent" :label="$t1('上级ID')"></el-option>
+                    <el-option value="treePath" :label="$t1('树ID路径')"></el-option>
+                    <el-option value="treePathName" :label="$t1('树名称路径')"></el-option>
+                    <el-option value="hasChild" :label="$t1('是否有下级')"></el-option>
+                    <el-option value="grade" :label="$t1('层级')"></el-option>
+                  </el-select>
+                </template>
               </vxe-grid>
             </div>
             <table class="table-detail">
@@ -559,7 +575,7 @@
                       <i
                         slot="suffix"
                         class="el-input__icon el-icon-search"
-                        @click="showEntityFieldDialog1 = true"
+                        @click="openEntityFieldDialog1"
                       ></i>
                     </el-input>
                   </el-form-item>
@@ -584,7 +600,7 @@
                       <i
                         slot="suffix"
                         class="el-input__icon el-icon-search"
-                        @click="showEntityFieldDialog2 = true"
+                        @click="openEntityFieldDialog2"
                       ></i>
                     </el-input>
                   </el-form-item>
@@ -689,6 +705,117 @@
         </el-button>
       </span>
     </el-dialog>
+
+<!--begin-->
+<el-dialog
+      :title="$t1('数据值对应表字段')"
+      v-if="showToTaBmZdDialog"
+      :visible.sync="showToTaBmZdDialog"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      :modal="false"
+      custom-class="dialog-style wf-dialog"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <el-form>
+        <div id="containt">
+          <table class="table-detail">
+            <tbody>
+              <tr>
+                <th>
+                  <span class="t">
+                    {{ $t1("关联表") }}
+                  </span>
+                </th>
+                <td>
+                  <el-form-item label="">
+                    <el-input
+                      class="search-input"
+                      max="200"
+                      v-model="toTaBmZdEntity"
+                      @clear="
+                        toTaBmZdEntity = null;
+                        toTaBmZdField = null;
+                      "
+                      v-el-readonly
+                      clearable
+                    >
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="showEntityDialog3 = true"
+                      ></i>
+                    </el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  <span class="t">
+                    {{ $t1("关联字段") }}
+                  </span>
+                </th>
+                <td>
+                  <el-form-item label="">
+                    <el-input
+                      class="search-input"
+                      max="200"
+                      v-model="toTaBmZdField"
+                      @clear="toTaBmZdField = null"
+                      v-el-readonly
+                      clearable
+                    >
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="openEntityFieldDialog3"
+                      ></i>
+                    </el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="showToTaBmZdDialog = false"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1("取 消") }}
+        </el-button>
+        <el-button
+          type="primary"
+          @click="confirmToTaBmZdDialog"
+          class="button-sty"
+        >
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+
+    <szTaMbDialog
+      v-if="showEntityDialog3"
+      :visiable.sync="showEntityDialog3"
+      @confirm="confirmEntityDialog3"
+      :multi="false"
+    />
+
+    <zdDialog
+      v-if="showEntityFieldDialog3"
+      :visiable.sync="showEntityFieldDialog3"
+      @confirm="confirmEntityFieldDialog3"
+      :taBm="toTaBmZdEntity"
+      :multi="false"
+    />
+<!--end-->
+
   </div>
 </template>
 

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

@@ -78,6 +78,8 @@ modules = {
       showToTaBmZdDialog: false,
       toTaBmZdEntity: null,
       toTaBmZdField: null,
+      showEntityDialog3: false,
+      showEntityFieldDialog3: false,
     };
   },
   created() {
@@ -298,6 +300,14 @@ modules = {
               default: "zdType",
             },
           },
+          {
+            title: this.$t1("树标识"),
+            field: "treeFlag",
+            width: 150,
+            slots: {
+              default: "treeFlag",
+            },
+          },
           {
             title: this.$t1("关联字段"),
             field: "referenceZd",
@@ -311,10 +321,18 @@ modules = {
             field: "refServiceName",
             width: 200,
           },
+          {
+            title: this.$t1("数据值对应表的字段"),
+            field: "toTaBmZd",
+            width: 250,
+            slots: {
+              default: "toTaBmZd",
+            },
+          },
           {
             title: this.$t1("字段类型对应的默认值"),
             field: "zdTypeValues",
-            width: 150,
+            width: 200,
             slots: {
               default: "zdTypeValues",
               /*default: ({row, rowIndex, $table}) => {
@@ -480,6 +498,8 @@ modules = {
         orders: newIndex,
         generateCode: false,
         fromTable: false,
+        toTaBmZd: null,
+        treeFlag:null
       };
       this.szTaMb.szTaZdMbDTOs.splice(0, 0, item);
     },
@@ -713,12 +733,26 @@ modules = {
         this.refServiceName = row.serviceName;
       }
     },
+    openEntityFieldDialog1() {
+      if (!this.referenceEntity) {
+        this.$baseAlert("关联表不能为空");
+        return;
+      }
+      this.showEntityFieldDialog1 = true;
+    },
     confirmEntityFieldDialog1(rows) {
       if (rows.length) {
         let row = rows[0];
         this.referenceKey = row.taZdMc;
       }
     },
+    openEntityFieldDialog2() {
+      if (!this.referenceEntity) {
+        this.$baseAlert("关联表不能为空");
+        return;
+      }
+      this.showEntityFieldDialog2 = true;
+    },
     confirmEntityFieldDialog2(rows) {
       if (rows.length) {
         this.referenceShowRows = rows;
@@ -962,7 +996,46 @@ modules = {
       this.currentIndex = rowIndex;
       this.showToTaBmZdDialog = true;
     },
-    confirmToTaBmZdDialog(rows) {},
+    confirmToTaBmZdDialog() {
+      let toTaBmZdEntity = this.toTaBmZdEntity;
+      let toTaBmZdField = this.toTaBmZdField;
+      if (!toTaBmZdEntity) {
+        this.$baseAlert(this.$t1("关联表不能为空"));
+        return;
+      }
+      if (!toTaBmZdField) {
+        this.$baseAlert(this.$t1("关联字段不能为空"));
+        return;
+      }
+      this.szTaMb.szTaZdMbDTOs[this.currentIndex].toTaBmZd =
+        toTaBmZdEntity + "." + toTaBmZdField;
+      this.showToTaBmZdDialog = false;
+    },
+    openEntityDialog3() {
+      this.showEntityDialog3 = true;
+    },
+    confirmEntityDialog3(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        if (this.toTaBmZdEntity != row.taBm) {
+          this.toTaBmZdEntity = row.taBm;
+          this.toTaBmZdField = null;
+        }
+      }
+    },
+    openEntityFieldDialog3() {
+      if (!this.toTaBmZdEntity) {
+        this.$baseAlert(this.$t1("关联表不能为空"));
+        return;
+      }
+      this.showEntityFieldDialog3 = true;
+    },
+    confirmEntityFieldDialog3(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.toTaBmZdField = row.taZdMc;
+      }
+    },
   },
 };
 export default modules;