From dc9f1a633caa2031873d9a1ed7d924c8a675d098 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 20 十一月 2023 16:11:08 +0800
Subject: [PATCH] 自定义流水算法serialType类型

---
 Source/UBCS-WEB/src/const/code/codeSynonym.js                |    1 
 Source/UBCS-WEB/src/views/code/code.vue                      |   20 +++---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue  |   22 +++++++
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |    2 
 Source/UBCS-WEB/vue.config.js                                |    4 
 Source/UBCS-WEB/src/components/FormTemplate/FormBulkEdit.vue |  112 +++++++++++++++++++++++++++++++++++++
 6 files changed, 146 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormBulkEdit.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormBulkEdit.vue
new file mode 100644
index 0000000..d8a0747
--- /dev/null
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormBulkEdit.vue
@@ -0,0 +1,112 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :visible.sync="dialogVisible"
+    append-to-body
+    class="avue-dialog avue-dialog--top"
+    style="max-height: 800px;"
+    title="鎵归噺淇敼"
+    top="-5vh"
+    @opened="openDialog"
+  >
+    <el-table class="cus-table" ref="dataTable" :data="EditTableList"   @cell-click="handleCellClicks" border>
+      <el-table-column v-if="EditTableList.length != 0"  type="selection" width="55"></el-table-column>
+      <el-table-column v-if="EditTableList.length != 0"  label="搴忓彿" type="index" width="55">
+      </el-table-column>
+      <el-table-column v-for="item in this.tableHeadFindData"
+                       :key="item.id"
+                       :formatter="item.formatter"
+                       :label="item.label" :prop="item.prop"
+                       :show-overflow-tooltip="true"
+                       :sortable="item.sortable"
+                       :width="item.width"
+                       align="center">
+        <template  slot-scope="{ row }">
+          <el-input>
+
+          </el-input>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import {getFormTemplate} from "@/api/formTemplate.js";
+
+export default {
+  name: "FormBulkEdit",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    codeClassifyOid: {
+      type: String,
+      default: "",
+    },
+    templateOid: {
+      type: String,
+      default: "",
+    },
+    tableData: {
+      type: Array,
+      default: []
+    },
+    selectRow: {
+      type: Array,
+      default: []
+    },
+    tableHeadFindData: {
+      type: Array,
+      default: []
+    }
+  },
+  data() {
+    return {
+      EditTableList: []
+    }
+  },
+  created() {
+
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {
+    //琛ㄦ牸鍗曞厓鏍肩紪杈�
+    handleCellClicks(){
+
+    },
+    openDialog() {
+      this.EditTableList = this.tableData.filter(item => {
+        return this.selectRow.some(key => {
+          return item.oid === key.oid;
+        });
+      });
+      console.log(this.EditTableList)
+      console.log(this.tableHeadFindData)
+    },
+    getFormTemplate() {
+      getFormTemplate({
+        templateOid: this.templateOid,
+        codeClassifyOid: this.codeClassifyOid,
+      }).then(res => {
+        console.log(res)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index dff9401..0c0d40a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -316,8 +316,6 @@
             value: "key",
           },
         };
-        // console.log('formItem',formItem)
-        // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
         if (group.length === 0) {
           column.push(columnItem);
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index af9a9af..af69b6f 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -99,6 +99,8 @@
                               :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
                               :visible.sync="editvisible"
                               type="edit" @submit="EditSumbit"></FormTemplateDialog>
+          <!--          鎵归噺缂栬緫-->
+          <FormBulkEdit :visible.sync="bulkeditvisible"></FormBulkEdit>
           <!--          鏁版嵁璇︽儏-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                                :rowOid="this.LinkObject.oid" :templateOid="templateOid"
@@ -188,7 +190,7 @@
     SetPersonnel,
     ResembleQueryDialog,
     BatchImport,
-    fileInHtml
+    fileInHtml,
   },
   name: "Crud.vue",
   props: {
@@ -241,6 +243,8 @@
   },
   data() {
     return {
+      //鎵归噺缂栬緫瀵硅瘽妗�
+      bulkeditvisible:false,
       LinkVisible: false,
       LinkObject: {}, // 缂栫爜鏁版嵁
       LinkList: [],
@@ -516,6 +520,8 @@
         if (uniqueFlag === 'CODEAPPLY') return this.codeApplyHandler()
         //  鏍囧噯淇
         if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
+        //鎵归噺缂栬緫
+        if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler()
       });
     },
     //鏍囧噯鐢宠
@@ -541,6 +547,20 @@
         this.rowOid = this.selectRow[0].oid;
       }
     },
+    //鎵归噺缂栬緫
+    bulkEditHandler(){
+      if(this.selectRow.length <= 0){
+        this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒')
+        return;
+      }
+      const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
+
+      if (Editing) {
+        this.bulkeditvisible = true;
+      } else {
+        this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
+      }
+    },
     addSaveHandler(){
       this.$nextTick(() => {
         this.addvisible = true;
diff --git a/Source/UBCS-WEB/src/const/code/codeSynonym.js b/Source/UBCS-WEB/src/const/code/codeSynonym.js
index 2823087..6103410 100644
--- a/Source/UBCS-WEB/src/const/code/codeSynonym.js
+++ b/Source/UBCS-WEB/src/const/code/codeSynonym.js
@@ -213,6 +213,7 @@
       label: "鎵�灞炶涓氬悕绉�",
       prop: "name",
       type: "input",
+      labelWidth:110,
       search: true,
     },
     {
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 023dbcb..1202340 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -886,14 +886,10 @@
                         :referConfig="this.referConfig || {}"
                         :display="true"
                         :value="form.customCodeSerialClass"
-                        :text="form.customCodeSerialClass"
+                        :text="form.customCodeSerialClassText"
+                        :serialType="form.serialType"
                         @setReferValue="setReferValue"
                       ></vciWebRefer>
-<!--                                    <el-input-->
-<!--                                      v-model="form.customCodeSerialClass"-->
-<!--                                      :readonly="basicSecOnlyRead"-->
-<!--                                      @focus="streamFocusHandler"-->
-<!--                                    ></el-input>-->
                   </template>
 
 
@@ -1369,13 +1365,15 @@
         title: '鑷畾涔夋祦姘村弬鐓�',
         showField: 'customCodeSerialClassText',
         field: 'customCodeSerialClass',
-        fieldMap:  {},
+        fieldMap:  {
+          serialType:"serialType"
+        },
         placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
         options:   {
           // 璁剧疆榛樿鐨勫睘鎬�
           url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm',
+          textField:'name',
           valueField:'classFullName',
-          textField:'classFullName',
           isMuti: false,
           type: "grid",
           method: 'get',
@@ -1388,6 +1386,7 @@
               {title: '绠楁硶缂栧彿', field: 'id', width: 200},
               {title: '绠楁硶鍚嶇О', field: 'name', width: 150},
               {title: '绫诲叏璺緞', field: 'classFullName', width: 300},
+              {title: '绫诲瀷', field: 'serialType', width: 300},
               {title: '鎻忚堪', field: 'description'}
             ],
             queryColumns: [
@@ -1717,10 +1716,11 @@
   methods: {
     //鑷畾涔夋祦姘村け鐒�
     setReferValue(data){
-      console.log(data)
       if(data.field){
         this.form[data.field] = data.value || "";
-        // this.form[data.showField] = data.text || "";
+        this.form[data.showField] = data.text || "";
+        this.form.serialType = data.rawData[0].serialType || "";
+
       }
     },
     /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 264ceae..fcfbd7d 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,9 +26,9 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-        target: 'http://127.0.0.1:37000',
+        // target: 'http://127.0.0.1:37000',
         // target: 'http://192.168.1.51:37000',
-        // target: 'http://dev.vci-tech.com:37000',
+        target: 'http://dev.vci-tech.com:37000',
         //yxc
         // target: 'http:// 192.168.0.104:37000',
         // target: 'http://192.168.0.105:37000',

--
Gitblit v1.9.3