工艺规程/智能排产/物料管理/datagrid......

components/page/dataGrid.vue

@@ -519,9 +519,9 @@ export default {
                 const filterVal = []; //list里对象的属性
                 var tempCol = [];
                 var tempCol1 = [];
-                var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata  this.$refs.grid.columnsCur
+                var columnsCur = this.$u.clone(this.columnsCur); //导出列标题信息griddata  this.$refs.grid.columnsCur
                 columnsCur.forEach((el) => {
-                    if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
+                    if ((el.hide && el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
                         if (el.code) {
                             tempCol.push({
                                 key: el.key,

components/page/import/process.vue

@@ -215,12 +215,13 @@ export default {
             useData.forEach(eles => {
                 //如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id
                 if (
-                    eles.departmentTitle &&
-                    eles.departmentTitle != "" &&
+                    [(eles.departmentTitle &&
+                        eles.departmentTitle != "") || (eles.departmentName &&
+                        eles.departmentName != "")] &&
                     (!eles.departmentId || eles.departmentId == "")
                 ) {
                     this.departArr.forEach((e) => {
-                        if (eles.departmentTitle && eles.departmentTitle == e.name) {
+                        if ((eles.departmentTitle && eles.departmentTitle == e.name) || (eles.departmentName && eles.departmentName == e.name)) {
                             eles.departmentId = e.id;
                         }
                     });
@@ -228,14 +229,16 @@ export default {
                     //如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle
                     eles.departmentId &&
                     eles.departmentId + "" != "" &&
-                    (!eles.departmentTitle || eles.departmentTitle == "")
+                    (!eles.departmentTitle || eles.departmentTitle == "") && (!eles.departmentName || eles.departmentName == "")
                 ) {
                     this.departArr.forEach((e) => {
                         if (eles.departmentId && eles.departmentId == e.id) {
                             eles.departmentTitle = e.name;
+                            eles.departmentName = e.name;
                         }
                     });
                 }
+
                 arrTitleUse.forEach((elem) => {
                     if (eles[elem.key] && eles[elem.key] != "" && eles[elem.key] != null) {
                         //如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值

components/page/productSelect.vue

-   <template>
-  <Select v-model="dep" :placeholder="placeholdeinfo" clearable @on-clear="onClear">
-    <Option
-      v-for="(item,index) in list"
-      :key="index"
-      :value="item.value"
-      style="display:none"
-      :label="item.label"
-    ></Option>
+<template>
+<Select v-model="dep" :placeholder="placeholdeinfo" clearable @on-clear="onClear">
+    <Option v-for="(item,index) in list" :key="index" :value="item.value" style="display:none" :label="item.label"></Option>
     <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
-  </Select>
+</Select>
 </template>
-    <script>
+
+<script>
 export default {
     name: "Add",
     model: {
@@ -59,7 +54,10 @@ export default {
                 this.selectdata = data;
                 if (data[0].isProduct == "1") {
                     this.list = [];
-          this.list.push({ label: data[0].title, value: data[0].id });
+                    this.list.push({
+                        label: data[0].title,
+                        value: data[0].id
+                    });
                     this.orderSearchForm.productName = data[0].title;
                     this.orderSearchForm.productId = data[0].productId;
                     this.orderSearchForm.drawingNo = data[0].drawingNo;
@@ -97,7 +95,11 @@ export default {
                 }
             });
         },
-    renderContent(h, { root, node, data }) {
+        renderContent(h, {
+            root,
+            node,
+            data
+        }) {
             let type = "md-folder";
             let title = data.title;
             if (data.isProduct != 0) {
@@ -114,8 +116,7 @@ export default {
             }
             //渲染树的样式
             return h(
-        "span",
-        {
+                "span", {
                     on: {
                         click: () => {
                             let arrTree = [];
@@ -134,8 +135,7 @@ export default {
                         }
                     }),
                     h(
-            "span",
-            {
+                        "span", {
                             style: {
                                 color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)"
                             }
@@ -171,7 +171,10 @@ export default {
                             dataTemp.forEach(data => {
                                 if (data.isProduct == 1 && data.id == this.dep) {
                                     this.placeholdeinfo = data.title;
-                  this.list.push({ label: data.title, value: data.id });
+                                    this.list.push({
+                                        label: data.title,
+                                        value: data.id
+                                    });
                                 }
                             });
                         }

i18n/locale/zh-CN.js

@@ -1173,10 +1173,11 @@ export default {
     code: '工艺文件编号',
     productId: '产品id',
     productName: '产品名称',
+    productBomId: '产品BomId',
     drawingNo: '图号',
     version: '版本',
     author: '编制人',
-    departmentId: '主制车间',
+    departmentId: '主制车间Id',
     departmentName: '主制车间',
     isMain: '主工艺',
     upId: '父工艺',
@@ -1186,8 +1187,8 @@ export default {
     approvalStatus: '审批状态',
     remark: '工艺说明',
     approvalStatusRemark: '审批备注',
-    auditUserId1: '审批人',
-    auditUserId2: '审批人',
+    auditUserId1: '审批人1',
+    auditUserId2: '审批人2',
     isDeleted: '是否删除',
     platesnum: '板数',
     isEffect: '有效',

pages/aps/ai/index.vue

@@ -6,6 +6,7 @@
             <Search />
         </template>
         <template slot="buttons">
+            应用规则：
             <Select v-model="rulesAi" multiple style="width:280px;" class="tl">
                 <Option v-for="item in rulesAiList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>

pages/import/process.vue

@@ -678,12 +678,13 @@ export default {
             useData.forEach(eles => {
                 //如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id
                 if (
-                    eles.departmentTitle &&
-                    eles.departmentTitle != "" &&
+                    [(eles.departmentTitle &&
+                        eles.departmentTitle != "") || (eles.departmentName &&
+                        eles.departmentName != "")] &&
                     (!eles.departmentId || eles.departmentId == "")
                 ) {
                     this.departArr.forEach((e) => {
-                        if (eles.departmentTitle && eles.departmentTitle == e.name) {
+                        if ((eles.departmentTitle && eles.departmentTitle == e.name) || (eles.departmentName && eles.departmentName == e.name)) {
                             eles.departmentId = e.id;
                         }
                     });
@@ -691,11 +692,12 @@ export default {
                     //如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle
                     eles.departmentId &&
                     eles.departmentId + "" != "" &&
-                    (!eles.departmentTitle || eles.departmentTitle == "")
+                    (!eles.departmentTitle || eles.departmentTitle == "") && (!eles.departmentName || eles.departmentName == "")
                 ) {
                     this.departArr.forEach((e) => {
                         if (eles.departmentId && eles.departmentId == e.id) {
                             eles.departmentTitle = e.name;
+                            eles.departmentName = e.name;
                         }
                     });
                 }

pages/materiel/masterData/masterData.vue

@@ -74,12 +74,16 @@ export default {
                     key: "codeRuleType",
                     title: "类型",
                     align: "center",
-                    code: "material.code.type"
+                    code: "material.code.type",
+                    import: true,
+                    hide: true,
                 },
                 {
                     key: "codeRuleId",
                     title: "编码名称",
                     materialKey: '3',
+                    import: true,
+                    hide: true,
                     render: (h, params) => {
                         return h(
                             "span", {},
@@ -92,6 +96,8 @@ export default {
                     title: "大类",
                     align: "right",
                     materialKey: '1',
+                    import: true,
+                    hide: true,
                     render: (h, params) => {
                         return h(
                             "span", {},
@@ -104,6 +110,8 @@ export default {
                     title: "子类",
                     align: "right",
                     materialKey: '2',
+                    import: true,
+                    hide: true,
                     render: (h, params) => {
                         return h(
                             "span", {},

pages/technology/add.vue

 <template>
-  <Form ref="form" :model="entity" :rules="rules" :label-width="110">
+<Form ref="form" :model="entity" :rules="rules" :label-width="110">
     <Row>
         <!-- <Col :span="12">
         <FormItem :label="l('classId')" prop="classId">
@@ -52,7 +52,7 @@
         </Col>
         <Col :span="8">
         <FormItem :label="l('departmentName')" prop="departmentId">
-          <departmentSelect v-model="entity.departmentId" type="3" @on-change="departChange"></departmentSelect>
+            <departmentSelect v-model="entity.departmentId" :type="3" @on-change="departChange"></departmentSelect>
         </FormItem>
         </Col>
         <Col :span="8">
@@ -151,9 +151,11 @@
         <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
-  </Form>
+</Form>
 </template>
-    <script>
+
+    
+<script>
 import Api from "./api";
 import ApiWorkflow from "../workflow/process/api";
 import iQuill from "@/components/quill";
@@ -197,16 +199,22 @@ export default {
                 fileId: ""
             },
             rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }],
-        routingType: [
-          {
+                name: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }],
+                code: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }],
+                routingType: [{
                     required: true,
                     message: "请选择工艺类型",
                     trigger: "change",
                     type: "number"
-          }
-        ]
+                }]
             },
             parms: {
                 app: "technology",
@@ -328,7 +336,9 @@ export default {
             }
         },
         load(v) {
-      Api.get({ id: v }).then(r => {
+            Api.get({
+                id: v
+            }).then(r => {
                 this.entity = r.result;
                 this.entity.isEffect = parseInt(r.result.isEffect);
                 this.entity.id = 0;
@@ -336,7 +346,10 @@ export default {
             this.getCodNumber();
         },
         getCodNumber() {
-      Api.getCodeNumber({ code: "GY", count: "1" }).then(r => {
+            Api.getCodeNumber({
+                code: "GY",
+                count: "1"
+            }).then(r => {
                 if (r.success) {
                     this.entity.code = r.result[0];
                 } else {

pages/technology/details/routingsupporting/index.vue

@@ -16,11 +16,13 @@
         </template>
         <template slot="buttons">
             <Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button>
+            <Button @click="openModalIm">导入</Button>
         </template>
     </DataGrid>
     <Modal v-model="modal" :title="title" width="1200" footer-hide>
         <component :is="detail" :eid="curId" :headid="hid" :productBomId="productBomId" @on-close="cancel" @on-ok="ok" />
     </Modal>
+    <ImportExcel ref="importExcel" @on-get-data="getData" :modalTitle="temTitle" :columns="cols" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
 </div>
 </template>
 
@@ -229,6 +231,8 @@ export default {
             ],
             headerStatus: -1,
             productBomId: -1,
+            ModalIm: false,
+            temTitle: "工艺Bom",
         };
     },
     created() {
@@ -298,6 +302,48 @@ export default {
             this.curId = 0;
             this.modal = false;
         },
+        //批量导入start
+        //导入功能
+        openModalIm() {
+            this.ModalIm = true
+        },
+        ModalImCancel() {
+            this.ModalIm = false
+        },
+        getData(val) {
+            let url = `${technologyUrl}productinfoimportservice/import`;
+            this.$refs.importExcel.deelData(url, this.cols, this.formatMethod(val))
+        },
+        //根据页面二次处理数据
+        formatMethod(val) {
+            let tempData = this.$u.clone(val);
+            let tempList = [];
+            tempData.forEach((ele) => {
+                let obj = {
+                    name: ele.name ? ele.name : '',
+                    version: ele.version ? Number(ele.version) : '',
+                    drawing: ele.drawing ? ele.drawing : '',
+                    description: ele.description ? ele.description : "",
+                    code: 0,
+                    status: this.nodeInfo.status == 1 ? 3 : 0,
+                    codeRuleId: this.nodeInfo.codeRuleId,
+                    categoryId: this.nodeInfo.categoryId, //左侧树点击的id
+                    customProperties: {},
+                    rootCategoryId: this.nodeInfo.rootCategoryId, //左侧树点击的数据的最顶层id
+                    codeRuleType: this.nodeInfo.codeRuleType
+                };
+                if (ele.name && ele.name != '') {
+                    obj.ico = false
+                } else {
+                    obj.ico = true
+                }
+                tempList.push(obj);
+
+            });
+            return tempList
+
+        },
+        //批量导入end
         l(key) {
             let vkey = "routingsupporting" + "." + key;
             return this.$t(vkey) || key;