kz-ui-base 1.0.48 → 1.0.49

package/list-base-page/listBasePageTs.vue

@@ -1015,7 +1015,7 @@ import {
 import { filePriview, getFilePriviewUrl, getFileNickName } from "@utils/file";
 import * as Utils from "@utils/utils";
 
-import WfDialog from "@srcComponents/base/dialog/wfDialog.vue";
+import WfDialog from "@/components/base/dialog/wfDialog.vue";
 
 import { getToken } from "@utils/auth";
 import _ from "lodash";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "",
   "main": "index.js",
   "scripts": {

package/views/basicdata/employeeSkill/index.vue

@@ -0,0 +1,157 @@
+
+<script>
+import { Component } from "vue-property-decorator";
+import {ListBasePage} from "kz-ui-base";
+// import SampleEditDialog from "@views/sample/dialog/sampleEditDialog";
+
+import {
+  listEntity,
+  getEntity,
+  addEntity,
+  updateEntity,
+  getUrl,
+} from "@api/common/common";
+
+@Component
+export default class EmployeeSkillList extends ListBasePage {
+  //微服务模块名称
+  moduleName = "basic";
+  //实体名称-服务名称
+  serviceName = "employeeSkill";
+  pkField = "id";
+  // 列表设置
+  listSetting = {
+    //是否显示操作栏
+    isShowOpColumn: false,
+  };
+  // 列表列信息
+  listColumns = [
+    // { key: 0, label: "序号", visible: true },
+    // {text: "人员Id", property: "employeeId", setting: { dictType: "${column.dictType}" } },
+    {
+      text: "人员编号",
+      property: "employeeCode",
+      setting: { dictType: "${column.dictType}" },
+    },
+    {
+      text: "人员姓名",
+      property: "employeeName",
+      setting: { dictType: "${column.dictType}" },
+    },
+    {
+      text: "技能编号",
+      property: "skillCode",
+      setting: { dictType: "${column.dictType}" },
+    },
+    {
+      text: "技能名称",
+      property: "skillName",
+      setting: { dictType: "${column.dictType}" },
+    },
+    {
+      text: "备注",
+      property: "remark",
+      setting: { dictType: "${column.dictType}" },
+    },
+  ];
+  // 查询条件
+  searchRules = [
+    {
+      width: 24,
+      text: "人员编号",
+      property: "employeeCode",
+      displayType: "DropDownList",
+      setting: {
+        url: "/system/user/list",
+        displayField: "userName",
+        formatKeyValue: true,
+        valueField: "userCode",
+      },
+    },
+    {
+      op: "LI",
+      text: "人员姓名",
+      property: "employeeName",
+      displayType: "TextBox",
+    },
+    { op: "LI", text: "技能编号", property: "skillCode", displayType: "TextBox" },
+    { op: "LI", text: "技能名称", property: "skillName", displayType: "TextBox" },
+  ];
+  // 列信息
+  editColumns = [
+    {
+      width: 24,
+      text: "人员编号",
+      property: "employeeId",
+      displayType: "DropDownList",
+      setting: {
+        url: "/system/user/list",
+        displayField: "userName",
+        // formatKeyValue: true,
+        valueField: "userId",
+      },
+    },
+    /*     {
+          width: 24,
+          text: "人员ID",
+          property: "employeeId",
+          displayType: "TextBox",
+          // disabled: true,
+        },
+        {
+          width: 24,
+          text: "人员姓名",
+          property: "employeeName",
+          displayType: "TextBox",
+          disabled: true,
+        }, */
+    {
+      width: 24,
+      text: "技能",
+      property: "skillCode",
+      displayType: "DropDownList",
+      setting: {
+        url: "/basic/skill/list",
+        displayField: "skillName",
+        formatKeyValue: true,
+        valueField: "skillCode",
+        // assignment: ["skillName"],
+      },
+    },
+    /*    {
+         width: 24,
+         text: "技能名称",
+         property: "skillName",
+         displayType: "TextBox",
+         disabled: true,
+       }, */
+    {
+      width: 24,
+      text: "备注",
+      property: "remark",
+      displayType: "TextArea",
+      setting: { height: 4 },
+    },
+  ];
+
+  // 表单校验
+  editRules = {};
+  created () {
+    this.editSetting.width = "30%";
+    this.updateOpMenu({ visable: false }, [
+      "import",
+      "print",
+      "copy",
+      "detail",
+      "custom1",
+      "search",
+      "export",
+    ]);
+  }
+  /*   onChangeEvent (args) {
+      if (args.property == "employeeCode") {
+        this.$set(this.currentEntity, "employeeName", args.text);
+      }
+    } */
+}
+</script>

package/views/pd/prodstructTemplate/components/DocModifyDialog.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="dialog-body-wrapper">
+    <el-form ref="docForm" :model="fileInfo" :rules="docModifyRules">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="文档类型" label-width="80px" prop="designdocTypeCode">
+            <el-select v-model="fileInfo.designdocTypeCode" placeholder="文档类型" clearable size="small">
+              <el-option
+                v-for="dict in designdocTypeCodeOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-upload
+            class="upload"
+            :action="uploadFileUrl"
+            @change="onFileChangeEvent"
+            :data="{ folderId: '0' }"
+            :limit="limit"
+            :on-error="handleUploadError"
+            :on-exceed="handleExceed"
+            :on-success="handleUploadSuccess"
+            :headers="headers"
+            :on-progress='handleProgress'
+            ref="upload"
+            :on-remove="handleRemove"
+            :multiple="false"
+            :file-list="fileList">
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="文档名称" label-width="80px" prop="designdocName">
+            <el-input v-model="fileInfo.designdocName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="文档路径" label-width="80px" prop="designdocUrl">
+            <el-input :disabled="true" v-model="fileInfo.designdocUrl"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="fileInfo.remark"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import KZ_Upload from "@srcComponents/customForm/upload";
+import {getToken} from "kz-ui-base/common/src/utils/auth";
+
+export default {
+  name: "DocModifyDialog",
+  components: {KZ_Upload},
+  props: {
+    value: Object,
+    setting: {
+      type: Object,
+    }
+  },
+
+  data() {
+    return {
+      fileInfo: {
+        designdocTypeCode: null,
+        designdocName: '',
+        designdocUrl: '',
+        designdocUrlTmp: '',
+        remark: '',
+      },
+      dictMap: null,
+      selectedFile: undefined,
+      designdocTypeCodeOptions: [],
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/material/upload",
+      limit: 1,
+      fileArr: [],
+      fileList: [],
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      docModifyRules:{
+        designdocTypeCode: [
+          { required: true, message: "文档类型不能为空", trigger: "blur" },
+        ],
+        designdocName: [
+          { required: true, message: "文档名称不能为空", trigger: "blur" },
+        ],
+        designdocUrl:[
+          {required: true, message: "文件不能为空"}
+        ]
+      }
+
+
+    };
+  },
+
+  methods: {
+    onFileChangeEvent(value) {
+    },
+
+    handleUploadError(err) {
+
+      this.$message.error("上传失败, 请重试");
+
+    },
+    handleExceed() {
+      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+
+    onFileRowClick(row) {
+      this.selectedFile = row;
+    },
+
+    handleUploadSuccess(res, file, fileList) {
+      this.$set(this, 'fileArr', fileList)
+      this.fileArr.forEach((item, index) => {
+        if (item.status == 'success') {
+          if (item.response.code != 200) {
+            this.$message.error(item.response.msg)
+            this.$set(item, 'successFlag', false)
+          } else {
+            this.$set(item, 'progressPercent', 100)
+            this.$set(item, 'successFlag', true)
+
+          }
+        } else {
+          this.$set(item, 'successFlag', false)
+          this.$set(item, 'progressFlag', false)
+        }
+      })
+      if (res.code != 200) {
+        let uploadFiles = this.$refs['upload'].uploadFiles
+        let index = uploadFiles.indexOf(file);
+        if (uploadFiles[index].response != 200) {
+          uploadFiles.splice(index, 1);
+        }
+        return
+      }
+      this.$message.success("上传成功")
+      this.fileList.push({
+        name: file.name,
+        url: res.data.materialUrl,
+      });
+      this.fileInfo.designdocName = this.fileInfo.designdocName? this.fileInfo.designdocName : res.data.materialNick;
+      this.fileInfo.designdocUrl = res.data.materialUrl;
+    },
+
+    handleRemove(file, fileList) {
+      let uploadFiles = this.$refs['upload'].uploadFiles;
+      let index = uploadFiles.indexOf(file);
+      uploadFiles.splice(index, 1);
+      this.fileList.splice(index, 1);
+      this.fileInfo = Object.assign({},this.value.entity);
+    },
+
+    handleProgress(event, file, fileList) {
+      this.fileArr = fileList
+      this.fileArr.forEach(item => {
+        if (!item.percentage == 100) {
+          item.progressFlag = true
+          item.progressPercent = Math.abs(item.percentage.toFixed(0));
+        }
+      })
+    },
+
+    submitForm() {
+      this.$refs.docForm.validate((valid) => {
+        if (valid) {
+          this.copyProp(this.fileInfo, this.value.entity);
+          this.$emit("confirm", this.value.entity);
+        }
+      })
+
+    },
+    copyProp(from, to) {
+      for (let key of Object.keys(from)) {
+        this.$set(to, key, from[key]);
+        if (key === "siteId" && from[key] && this.getSite(from[key])) {
+          this.$set(to, "siteName", this.getSite(from[key])["componentName"]);
+        }
+        if (key.startsWith("is")) {
+          this.$set(to, key, from[key] === "0" ? "否" : "是");
+        }
+      }
+      return to;
+    },
+
+    cancel() {
+      this.$emit("close");
+    }
+  },
+
+  created() {
+     this.fileInfo = Object.assign({},this.value.entity);
+     this.getDicts("designdoc_type_code").then(res=>{
+       this.designdocTypeCodeOptions = res.data;
+    })
+  },
+}
+</script>
+<style scoped>
+.el-upload {
+  width: 100px;
+  height: 0;
+  line-height: 36px;
+}
+
+ .dialog-body-wrapper {
+   height: 100%;
+   margin-top: -20px;
+   border-top: 1px solid #e7e8ed;
+   width: calc(100% + 40px);
+   transform: translate(-20px, 0px);
+   padding: 12px 24px 0 24px;
+ }
+
+.dialog-footer {
+  padding-top: 12px;
+  border-top: 1px solid #e7e8ed;
+  width: calc(100% + 48px);
+  transform: translate(-24px, 17px);
+  text-align: center;
+}
+</style>

package/views/pd/prodstructTemplate/components/ProddesignDocDialog.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="dialog-body-wrapper">
+          <el-form :model="dtlInfo">
+            <el-row :gutter="10">
+              <el-col  v-for="item of formItems" :span="6">
+                <el-form-item :label="item.text" label-width="80px">
+                  <el-input :disabled="true" :value="resolveFormValue(item, dtlInfo)"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+
+        <div class="dialog_body">
+          <el-row  :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" size="mini" @click="handleAdd">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button :disabled="selectedFile== undefined" type="warning" size="mini" @click="handleEdit">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button :disabled="selectedFile==undefined" type="danger" size="mini" @click="handleRemove">删除</el-button>
+            </el-col>
+          </el-row>
+
+          <el-table :data="dtlInfo.fileList"
+                    @row-click="onFileRowClick"
+                    highlight-current-row
+          >
+            <el-table-column
+              type="index"
+              label="序号"
+              width="50"
+              align="center"
+            >
+              <template scope="scope">
+                <span>{{
+                    scope.$index +
+                    1
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="文档类型" prop="designdocTypeCode">
+            </el-table-column>
+            <el-table-column label="文件名称" prop="designdocName">
+            </el-table-column>
+            <el-table-column label="文件路径" prop="designdocUrl"></el-table-column>
+            <el-table-column label="备注" prop="remark"></el-table-column>
+          </el-table>
+        </div>
+
+    <slot name="footer">
+      <div class="dialog-footer" >
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </slot>
+  </div>
+</template>
+
+<script>
+import KZ_DropDownList from "@srcComponents/customForm/dropDownList";
+import {listDesignDoc} from "@srcApi/pd/prodstructTemplate";
+import DocModifyDialog from "@srcViews/pd/prodstructTemplate/components/DocModifyDialog";
+
+export default{
+  name: "ProddesignDocDialog",
+  components: {KZ_DropDownList},
+  props: {
+    value: Object,
+    setting: {
+      type: Object,
+    }
+  },
+
+  data() {
+    return {
+      dtlInfo:{},
+      formItems: [
+        {text: "层", property: "layer"},
+        {text: "结构描述", property: "prodstructItemDesc"},
+        {text: "物料种类", property: "itemCategoryId", useDict: true},
+        {text: "构成位置", property: "locationCode", useDict: true},
+        {text: "构成根数", property: "pieceCount"},
+        {text: "工艺要求", property: "technologicalRequireCode", useDict: true},
+        {text: "备注", property: "remark"}
+      ],
+      dictMap: null,
+      selectedFile: undefined
+
+    };
+  },
+
+  methods:{
+
+    onFileRowClick(row){
+      this.selectedFile = row;
+    },
+
+    resolveFormValue(col, dtlInfo){
+      if(col.useDict){
+        let options = this.dictMap[col.property].filter(x=>x.dictValue === dtlInfo[col.property]);
+        return options.length > 0? options[0].dictLabel : "";
+      }
+      return dtlInfo[col.property];
+    },
+
+    getList() {
+      if(!this.dtlInfo.hasOwnProperty('fileList') ){
+        if(this.dtlInfo.id != null){
+          listDesignDoc(this.dtlInfo.id).then((res) => {
+            this.$set(this.dtlInfo, "fileList", res.data);
+          })
+        }else{
+          this.$set(this.dtlInfo, "fileList", []);
+        }
+      }
+    },
+
+    handleAdd(){
+      let newFileRow = {
+        prodstructTemplateDtlId: this.dtlInfo.id,
+        designdocTypeCode: null,
+        designdocName: '',
+        designdocUrl: '',
+        remark: '',
+      }
+      let self = this;
+
+      this.Dialog.open({
+        component: DocModifyDialog,
+        setting: {
+          isShow: true,
+          title: "新增文档",
+          size: "small", //可选项tiny/small/large/full
+          width: "800px", //表格宽度 不传默认为800px
+          labelWidth: "100px", //input标题宽度  不传默认为100px
+          data: { entity: newFileRow },
+        },
+        confirm:(result) => {
+          self.dtlInfo.fileList.push(result);
+        },
+      });
+    },
+    handleEdit(){
+      this.Dialog.open({
+        component: DocModifyDialog,
+        setting: {
+          isShow: true,
+          title: "新增文档",
+          size: "small", //可选项tiny/small/large/full
+          width: "800px", //表格宽度 不传默认为800px
+          labelWidth: "100px", //input标题宽度  不传默认为100px
+          data: { entity: this.selectedFile },
+        },
+        confirm:(result) => {
+
+        },
+      });
+    },
+    handleRemove(){
+      let self = this;
+      self.$modal.confirm('确定要删除这条数据吗').then(() => {
+        for(let i = 0; i < self.dtlInfo.fileList.length; i++){
+          if(self.selectedFile === self.dtlInfo.fileList[i]){
+            if(!self.dtlInfo.deleteList){
+              self.dtlInfo.deleteList =[];
+            }
+            self.dtlInfo.deleteList.push(self.dtlInfo.fileList.splice(i,1)[0]);
+            return;
+          }
+        }
+      })
+    },
+
+    submitForm() {
+      this.copyProp(this.dtlInfo, this.value)
+      this.$emit("confirm", this.dtlInfo);
+    },
+
+    cancel() {
+      this.$emit("close");
+    },
+
+    copyProp(from, to) {
+      for (let key of Object.keys(from)) {
+        this.$set(to, key, from[key]);
+        if (key === "siteId" && from[key] && this.getSite(from[key])) {
+          this.$set(to, "siteName", this.getSite(from[key])["componentName"]);
+        }
+        if (key.startsWith("is")) {
+          this.$set(to, key, from[key] === "0" ? "否" : "是");
+        }
+      }
+      return to;
+    },
+
+  },
+
+  created() {
+    this.dtlInfo = _.cloneDeep(this.value);
+    this.dictMap = this.setting.dictMap;
+    this.getList();
+  },
+}
+</script>
+<style scoped>
+.dialog-body-wrapper {
+  height: 100%;
+  margin-top: -20px;
+  border-top: 1px solid #e7e8ed;
+  width: calc(100% + 40px);
+  transform: translate(-20px, 0px);
+  padding: 12px 24px 0 24px;
+}
+
+.dialog-footer {
+  padding-top: 12px;
+  border-top: 1px solid #e7e8ed;
+  width: calc(100% + 48px);
+  transform: translate(-24px, 17px);
+  text-align: center;
+}
+</style>