plm 工具具

src/views/modules/demoComponents/orderProperties.vue

@@ -361,6 +361,7 @@ export default {
       }
       //查询 属性模板
       this.searchAttributeList({})
+      this.attributeSaveDialog = true;
     },
     saveTestPropertiesItem(params){
       let i = 0;
@@ -418,7 +419,6 @@ export default {
       searchPropertiesItemList(inData).then(({data}) => {
         if (data && data.code === 0){
           this.searchDataList = data.rows;
-          this.attributeSaveDialog = true;
         }else {
           this.$message.warning(data.msg)
         }

src/views/modules/tooling/searchToolApply.vue

@@ -258,6 +258,9 @@
         <el-form-item :label="'申请总数'">
           <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
         </el-form-item>
+        <el-form-item  label="部门" required="required">
+          <dict-data-select :site="$store.state.user.site"  v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" >
         <el-form-item :label="'申请原因'">
@@ -404,7 +407,7 @@
   } from '@/api/changeManagement/changeManagement.js'
   import ApprovalInformation from "../changeManagement/approvalInformation.vue";
   import OssComponents from "../oss/ossComponents";
-
+  import DictDataSelect from "../sys/dict-data-select.vue"
   /*組件*/
   export default {
     components: {
@@ -412,7 +415,7 @@
       OssComponents,
       Chooselist,
       projectUploadFile,
-
+      DictDataSelect,
     },
     name: "null",
     data() {
@@ -591,6 +594,24 @@
             fixed: '',
             columnWidth: 70
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table1DepartmentDesc',
+            tableId: "106002Table1",
+            tableName: "刀具申请主表",
+            columnProp: "departmentDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "部门",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 106002,
@@ -1009,7 +1030,7 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await searchToolApplyHeader(this.searchData).then(({data}) => {
+        await searchProjectToolApplyHeader(this.searchData).then(({data}) => {
           this.exportList= data.page.list;
         })
 
@@ -1167,6 +1188,7 @@
           applyReason: row.applyReason,
           remark: row.remark,
           createBy: row.createBy,
+          department:row.department,
           detailList: [],
           status: row.status,
           rejectOpinion: '',

src/views/modules/tooling/toolingInfo.vue

@@ -104,6 +104,9 @@
         <el-form-item :label="'申请总数'">
           <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
         </el-form-item>
+        <el-form-item  label="部门" required="required">
+          <dict-data-select :site="$store.state.user.site"  v-model="dataForm.department" dict-type="tool_application_department" style="width: 130px"></dict-data-select>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" >
         <el-form-item :label="'申请原因'">
@@ -161,7 +164,7 @@
     saveProjectToolApply,
   } from "@/api/tool/toolApply.js"
   import Chooselist from '@/views/modules/common/Chooselist'
-  import DictDataSelect from "@/views/modules/sys/dict-data-select";
+  import DictDataSelect from "../sys/dict-data-select.vue"
   export default {
     components: {
       Chooselist,      DictDataSelect,
@@ -470,6 +473,7 @@
           applyReason:'',
           remark:'',
           createBy:'',
+          department:'',
           detailList:[],
         },
         toolData:[],
@@ -580,6 +584,7 @@
           applyReason:'',
           remark:'',
           createBy:this.$store.state.user.name,
+          department: '',
           detailList:[],
         };
         this.visible=true;
@@ -625,6 +630,12 @@
           })
           return false;
         }
+        if(this.dataForm.department===''||this.dataForm.department==null){
+          this.$alert('未选择部门！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         this.$confirm('确定要保存?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',