Merge remote-tracking branch 'origin/master'

 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>

 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);

 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;

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -8,16 +8,27 @@
          <div>
            <div style="display: flex; flex-direction: column;">
              <div style="display: flex;">
                <el-button plain size="small" type="primary" @click="TreeAdd" v-if="permissionList.TreeAddStatus">添加</el-button>
                <el-button plain size="small" type="primary" @click="TreeEdit" v-if="permissionList.TreeEditStatus">修改</el-button>
                <el-button plain size="small" type="primary" @click="TreeDel" v-if="permissionList.TreeDelStatus">删除</el-button>
                <el-button plain size="small" type="primary" @click="flushed" v-if="permissionList.flushedStatus">刷新</el-button>
                <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">添加
                </el-button>
                <el-button v-if="permissionList.TreeEditStatus" plain size="small" type="primary" @click="TreeEdit">修改
                </el-button>
                <el-button v-if="permissionList.TreeDelStatus" plain size="small" type="primary" @click="TreeDel">删除
                </el-button>
                <el-button v-if="permissionList.flushedStatus" plain size="small" type="primary" @click="flushed">刷新
                </el-button>
              </div>
              <div style="display: flex; margin-top: 10px">
                <el-button plain size="small" type="primary" @click="Enable" v-if="permissionList.EnableStatus">启用</el-button>
                <el-button plain size="small" type="primary" @click="Deactivate" v-if="permissionList.DeactivateStatus">停用</el-button>
                <el-button plain size="small" type="primary" @click.native="ImportExcel" v-if="permissionList.ImportExcelStatus">导入</el-button>
                <el-button plain size="small" type="primary" @click="ExportExcel" v-if="permissionList.ExportExcelStatus">导出</el-button>
                <el-button v-if="permissionList.EnableStatus" plain size="small" type="primary" @click="Enable">启用
                </el-button>
                <el-button v-if="permissionList.DeactivateStatus" plain size="small" type="primary" @click="Deactivate">
                  åœç”¨
                </el-button>
                <el-button v-if="permissionList.ImportExcelStatus" plain size="small" type="primary"
                           @click.native="ImportExcel">导入
                </el-button>
                <el-button v-if="permissionList.ExportExcelStatus" plain size="small" type="primary"
                           @click="ExportExcel">导出
                </el-button>
              </div>
            </div>
            <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -66,10 +77,10 @@
              <el-form-item label="是否参与关键属性校验：" label-width="170px">
                <el-switch
                  v-model="TreeAddform.codeKeyAttrValue"
                  active-text="是"
                  inactive-text="否"
                  active-color="#13ce66"
                  active-text="是"
                  inactive-color="#ff4949"
                  inactive-text="否"
                  @change="switchChange">
                </el-switch>
              </el-form-item>
@@ -117,9 +128,11 @@
                  </template>

            <template slot="menuLeft">
              <el-button plain size="small" type="primary" @click="FindeHanler" v-if="permissionList.FindStatus">查询</el-button>
              <el-button plain size="small" type="primary" @click="TemRefresh" v-if="permissionList.TemRefreshStatus">刷新</el-button>
              <el-button plain size="small" type="primary" @click="CloneBtn" v-if="permissionList.CloneBtnStuatus">从其它模板克隆</el-button>
              <el-button v-if="permissionList.FindStatus" plain size="small" type="primary"
                         @click="FindeHanler">查询</el-button>
              <el-button v-if="permissionList.TemRefreshStatus" plain size="small" type="primary"
                         @click="TemRefresh">刷新</el-button>
              <el-button v-if="permissionList.CloneBtnStuatus" plain size="small" type="primary" @click="CloneBtn">从其它模板克隆</el-button>
              <!--              æŸ¥è¯¢å¯¹è¯æ¡†-->
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询">
              <div>
@@ -415,6 +428,7 @@
import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";
import {mapGetters} from "vuex";

export default {
  name: "classifyTrees.vue",
  data() {
@@ -1100,7 +1114,10 @@
    },
    //分类树数据处理
    getAttr() {
      getAtrrList().then(res => {
      this.loading = true;
      return new Promise((resolve, reject) => {
        getAtrrList()
          .then(res => {
        this.Treedata = res.data;
        this.CloneTreedata = res.data;
        this.Treedata.forEach(() => {
@@ -1116,10 +1133,14 @@
          }
          return item;
        });
      }).catch(res => {
        this.$message.error(res)

            this.loading = false;
            resolve(); // å®Œæˆè¯·æ±‚，调用resolve方法
      })
          .catch(error => {
            this.$message.error(error)
            reject(error); // è¯·æ±‚出错，调用reject方法
          });
      });
    },
    //定义一个修改数据属性名的方法
    ModifyProperties(obj, oldName, newName) {
@@ -1166,34 +1187,30 @@
      this.$refs.myForm.clearValidate();
    },
    //树节点添加事件
    TreeAddHandler() {
    async TreeAddHandler() {
      if ((!this.TreeAddform.id || !this.TreeAddform.name) || (this.TreeFlagCode && !this.TreeAddform.btmTypeName)) {
        this.$message.warning('请输入内容！');
      } else {
        return;
      }
      try {
        const data = this.TreeAddform;
        this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
        TreeSave(data)
          .then(() => {
            this.$message({
              type: "success",
              message: "添加成功!",
            });
        await TreeSave(data)
        this.$message.success("添加成功!");
            Object.keys(this.TreeAddform).forEach(key => {
              this.TreeAddform[key] = "";
        });
              this.TreeAddform.codeKeyAttrValue = true;
              this.TreeAddform.isParticipateCheck = 1;
            });
            this.getAttr();
            this.TreeAddFormVisible = false;
            //添加完成后右侧清空
            this.ProData = [];
            this.Formlist = [];
          })
          .catch((res) => {
      } catch (res) {
            this.$message({
              type: "warning",
              message: res,
            });
          });
      }
    },
@@ -1265,82 +1282,96 @@
      }
    },
    //树刷新
    flushed() {
      this.loading = true
      this.getAttr()
      setTimeout(() => {
        this.loading = false;
    async flushed() {
        await this.getAttr()
        this.$refs.tree.setCurrentKey(null);
        this.nodeClickList = {}
        this.TreeList = []
        this.TreeFlagCode = true;
      }, 600);
    },
    //启用和停用都先判断状态
    //启用
    Enable() {
    async Enable() {
      if (Object.keys(this.nodeClickList).length < 1) {
        this.$message.warning('请先从树上选择一条数据')
      } else {
        this.$message.warning('请先从树上选择一条数据');
        return;
      }
        if (this.FlagObj.lcStatus == "Enabled") {
          this.$message({
            type: 'warning',
            message: '当前分类不是停用状态'
          });
        } else {
          this.$confirm('是否将子分类一并启用？', '提示', {
        return;
      }
      this.loading = true;
      try {
        const confirmResult = await this.$confirm('是否将子分类一并启用？', '提示', {
            confirmButtonText: '是',
            cancelButtonText: '取消',
            type: 'warning'
          }).then(() => {
            TreeEnable(this.nodeClickList).then(() => {
        });
        if (confirmResult) {
          await TreeEnable(this.nodeClickList).then(res => {
              this.$message({
                type: 'success',
                message: '启用成功!'
              });
              this.getAttr()
            })
          }).catch(() => {
          await this.getAttr();

        } else {
            this.$message({
              type: 'info',
              message: '已取消启用'
            });
          });
        }
      } catch (error) {
        console.error(error);
      } finally {
        this.loading = false;
      }
    },

    async Deactivate() {
      if (Object.keys(this.nodeClickList).length < 1) {
        this.$message.warning('请先从树上选择一条数据');
        return;
      }

    },
    //停用
    Deactivate() {
      if (Object.keys(this.nodeClickList).length < 1) {
        this.$message.warning('请先从树上选择一条数据')
      } else {
        if (this.FlagObj.lcStatus === "Disabled") {
          this.$message({
            type: 'warning',
            message: '当前分类不是启用状态!'
          });
        } else {
          this.$confirm('是否停用当前分类，停用后，子分类也将不能被使用，是否继续？', '提示', {
        return;
      }

      this.loading = true;
      try {
        const confirmResult = await this.$confirm('是否停用当前分类，停用后，子分类也将不能被使用，是否继续？', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning'
          }).then(() => {
            TreeDeactivate(this.nodeClickList).then(() => {
        });
        if (confirmResult) {
          await TreeDeactivate(this.nodeClickList).then(res => {
              this.$message({
                type: 'success',
                message: '停用成功!'
              });
              this.nodeClickList['flag'] = true;
              this.getAttr()
            })
          }).catch(() => {
          this.nodeClickList['flag'] = true;
          await this.getAttr();
        } else {
            this.$message({
              type: 'info',
              message: '已取消停用'
            });
          });
        }
      } catch (error) {
        console.error(error);
      } finally {
        this.loading = false;
      }
    },
    //树点击事件

 Source/UBCS-WEB/src/const/code/codeSynonym.js

@@ -213,6 +213,7 @@
      label: "所属行业名称",
      prop: "name",
      type: "input",
      labelWidth:110,
      search: true,
    },
    {

 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 || "";

      }
    },
    /** è½¬ç§»è§„则所有者对话框 */

 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',