审核流程修改

src/api/auditManagement/auditType.js

@@ -14,3 +14,6 @@ export const getUserBusinessRoleList = data => createAPI(`audit/getUserBusinessR
 
 // 保存用户审核权限信息
 export const saveUserBusinessRole = data => createAPI(`audit/saveUserBusinessRole`,'POST',data)
+
+//获取工具类型
+export const getPartFamilyList = data => createAPI(`base/getPartFamilyList`,'POST' ,data)

src/api/knifemold/receive.js

@@ -21,5 +21,8 @@ export const exportList =  data =>  createAPI(`toolMan/getExportList`,'POST',dat
 //获取审批记录信息
 export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data)
 
+// 获取工具打印
+export const printTool =  data =>  createAPI(`toolMan/printTool`,'POST',data)
+
 
 

src/api/knifemold/tool-info.js

@@ -18,5 +18,8 @@ export const getToolHeaderList = data => createAPI(`toolInfo/getToolHeaderList`,
 // 获取工具使用记录
 export const updateToolDetail = data => createAPI(`toolInfo/updateToolDetail`,'POST',data)
 
+// 获取工具打印
+export const printTool =  data =>  createAPI(`toolMan/printTool`,'POST',data)
+
 
 

src/views/modules/auditManagement/auditRules.vue

@@ -831,6 +831,7 @@ import {
         let queryData = {
           active : 'Y'
         }
+        this.selectList.select6 = []
         getBusinessRoleList(queryData).then(({data}) =>{
           let list = data.rows
           for (let i = 0; i < list.length; i++) {

src/views/modules/auditManagement/auditType.vue

@@ -113,6 +113,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="inputSearch8">
+          <el-select v-model="saveAuditTypeData.familyId" placeholder="请选择" style="width: 110px;">
+            <el-option
+              v-for="item in partFamilyList"
+              :key="item.familyID"
+              :label="item.familyName"
+              :value="item.familyID">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="inputSearch5">
           <el-input type="textarea" :rows="4" style="width: 238px;" v-model="saveAuditTypeData.remark"></el-input>
         </el-form-item>
@@ -153,6 +163,7 @@ import {
   getBusinessRoleList,
   saveBusinessRole,
   deleteBusinessRole,
+  getPartFamilyList,
 } from '@/api/auditManagement/auditType.js'
   export default {
     components: {
@@ -167,11 +178,13 @@ import {
         inputSearch5 : '备注',
         inputSearch6 : '状态',
         inputSearch7 : '记录类型',
+        inputSearch8 : '工具类型',
         saveAuditTypeData:{
           roleItemNo : 0,
           roleDesc : '',
           remark : '',
           active : '',
+          familyId : '',
         },
         //设置
         setUp :{
@@ -205,6 +218,7 @@ import {
           value: 'N',
           label: '禁用'
         },],
+        partFamilyList : [],
         // 默认table 查询参数
         queryTable: {
           functionId: 2201,
@@ -263,6 +277,23 @@ import {
             status: true,
             fixed: false,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2201,
+            serialNumber: 'auditType2201FamilyName',
+            tableId: "auditType2201",
+            tableName: "auditType",
+            columnProp: "familyName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "工具类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 2201,
@@ -500,8 +531,21 @@ import {
     activated() {
       this.getDataList()
       this.getLanguageList()
+      this.getPartFamily()
     },
     methods: {
+      getPartFamily(){
+        let jsonData = {
+          site : this.site,
+          active : 'Y',
+        }
+        this.partFamilyList = []
+        getPartFamilyList(jsonData).then(({data}) => {
+          if (data.success) {
+            this.partFamilyList = data.rows
+          }
+        })
+      },
       delAuditType(row){
         this.$confirm("确定删除该记录吗？", '删除提示', {
           confirmButtonText: '确定',
@@ -520,6 +564,13 @@ import {
       },
       saveAuditType(){
         this.setUp.saveButton = true
+        if(this.saveAuditTypeData.familyId == ''){
+          this.$alert('请选择记录类型！', '错误', {
+            confirmButtonText: '确定'
+          })
+          this.setUp.saveButton = false
+          return false
+        }
         saveBusinessRole(this.saveAuditTypeData).then(({data}) => {
           if (data.code == 0) {
             this.getDataList()
@@ -544,11 +595,13 @@ import {
           this.saveAuditTypeData.remark = ''
           this.saveAuditTypeData.active = 'Y'
           this.saveAuditTypeData.recordTypeDb = '87'
+          this.saveAuditTypeData.familyId = ''
         }else {
           this.saveAuditTypeData.roleItemNo = row.roleItemNo
           this.saveAuditTypeData.roleDesc = row.roleDesc
           this.saveAuditTypeData.remark = row.remark
           this.saveAuditTypeData.recordTypeDb = row.recordTypeDb
+          this.saveAuditTypeData.familyId = row.familyId
           if(row.active == "启用"){
             this.saveAuditTypeData.active = 'Y'
           }else {

src/views/modules/knifemold/receive.vue

@@ -111,7 +111,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="检验方式选择" :visible.sync="poToolFlag" width="655px">
+    <el-dialog title="检验方式选择" :visible.sync="poToolFlag" width="770px">
       <el-form :inline="true">
         <el-form-item :label = "inputSearch3">
           <el-input style="width: 90px;text-align: left;padding: 0px 5px;" @change="initQtyAlert()" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" v-model = "receiveQuantity"></el-input>
@@ -131,7 +131,8 @@
         </el-form-item>-->
         <el-form-item>
           <el-button type="primary" :disabled="generateFlag" @click="initMailFlag()" >{{buttons.generate}}</el-button> <!--@click="onSubmit"-->
-          <el-button type="primary" >{{buttons.print}}</el-button>  <!--@click="onSubmit"-->
+          <el-button type="primary" @click="printMethod('Y')">{{buttons.toolLabel}}</el-button>  <!--@click="onSubmit"-->
+          <el-button type="primary" @click="printMethod('N')">{{buttons.screenLabel}}</el-button>  <!--@click="onSubmit"-->
         </el-form-item>
         <el-table
           :data="poToolList"
@@ -279,6 +280,7 @@
     updateIfsTool,
     exportList,
     getFileList,
+    printTool,
   } from "@/api/knifemold/receive.js"
   import axios from "axios";
   import Vue from "vue";
@@ -289,6 +291,7 @@
     },
     data() {
       return {
+        pdfUrl : '',
         fileList : [],
         //设置
         setUp: {
@@ -772,6 +775,8 @@
           print : '打印',
           appendixInfo: '附件信息',
           fileDownload: '下载',
+          toolLabel : '工具标签',
+          screenLabel : '网版标签',
         },
         // 导出 start
         exportData: [],
@@ -896,6 +901,42 @@
       }
     },
     methods: {
+      printMethod(val){
+        if (this.currSelectList.length <= 0){
+          this.$alert('请选择工具信息！', '操作提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.bannersBut = false
+            }
+          });
+          return
+        }
+        let reportFamily = ''
+        if (val == 'Y'){
+          reportFamily = '工具标签'
+        }else {
+          reportFamily = '网版标签'
+        }
+        let toolInstanceId = ''
+        for (let i = 0; i < this.currSelectList.length; i++) {
+          toolInstanceId += this.currSelectList[i].toolInstanceId + ";"
+        }
+        toolInstanceId = toolInstanceId.substring(0 ,toolInstanceId.length -1)
+        let jsonData = {
+          reportFamily : reportFamily,
+          toolInstanceId : toolInstanceId,
+        }
+        printTool(jsonData).then(({data}) =>{
+          if (data.code != 0){
+            this.$alert(data.msg, '操作提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.bannersBut = false
+              }
+            });
+          }
+        })
+      },
       // 文件下载
       fileDownload(row) {
         axios.get('/api/ftp/file/downFtpFile/' + row.id, {

src/views/modules/knifemold/tool-info.vue

@@ -62,6 +62,7 @@
           <el-form-item >
 <!--            <el-button  type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
             <el-button  @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button>
+            <el-button  @click="printMethod()" type="primary">{{ buttons.print }}</el-button>
           </el-form-item>
         </el-form>
         <el-form :inline="true"  label-position="top" label-width="100px">
@@ -343,6 +344,7 @@
     getSfdcToolingHistList,
     getToolHeaderList,
     updateToolDetail,
+    printTool,
   } from '@/api/knifemold/tool-info.js'
 
   export default {
@@ -705,7 +707,8 @@
           search: '查询',
           download: '导出',
           settingTable: '设置列表',
-          defaultTable: '设置默认配置'
+          defaultTable: '设置默认配置',
+          print : '打印',
         },
         // 导出 start
         exportData: [],
@@ -811,6 +814,31 @@
       this.getLanguageList()
     },
     methods: {
+      printMethod(){
+        if (this.currentDetailData.toolInstanceId == ''){
+          this.$alert('请选择工具信息！', '操作提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+            }
+          });
+          return
+        }
+        let reportFamily = '工具标签'
+        let toolInstanceId = this.currentDetailData.toolInstanceId
+        let jsonData = {
+          reportFamily : reportFamily,
+          toolInstanceId : toolInstanceId,
+        }
+        printTool(jsonData).then(({data}) =>{
+          if (data.code != 0){
+            this.$alert(data.msg, '操作提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+              }
+            });
+          }
+        })
+      },
       rowDblclick(row, column, event){
         console.log(row)
         console.log(column)
@@ -1042,7 +1070,7 @@
       getFunctionButtonList() {
         searchFunctionButtonList(this.queryButton).then(({data}) => {
           if (JSON.stringify(data.data)!=='{}') {
-            this.buttons = data.data
+            //this.buttons = data.data
           } else {
             saveButtonList(this.buttonList).then(({data}) => {
             })

src/views/modules/purchaseorder/procurementReview.vue

@@ -207,7 +207,7 @@
 <!--          <span-->
 <!--            class="btn-def"-->
 <!--            @click.stop="pdfPrintAll">全部打印</span>-->
-<!--          <span-->
+<!--          <span-->pdfUrl
 <!--            class="btn-def"-->
 <!--            @click.stop="pdfPrint">部分打印</span>-->
 <!--        </div>-->

src/views/modules/purchaseorder/purchaseRequisition.vue

@@ -221,8 +221,14 @@
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item :label="inputSearch13">
-          <el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()"
-                    v-model="currentPRDetailData.orderref1"></el-input>
+          <el-select  v-model="currentPRDetailData.orderref1" placeholder="请选择" style="width: 143px;">
+            <el-option
+              v-for="item in selectList.select1"
+              :key="item.familyID"
+              :label="item.familyName"
+              :value="item.familyID">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item style="margin-top: 30px">
           <upload v-on:childByValue="childByValue"></upload>
@@ -383,6 +389,7 @@ export default {
   components: {upload},
   data() {
     return {
+      pdfUrl : '',
       insertFileList: [],
       fileList: [],
       // table 高度
@@ -436,6 +443,9 @@ export default {
         limit: '',
         page: '',
       },
+      selectList: {
+        select1: [],
+      },
       userId: this.$store.state.user.name,
       site: this.$store.state.user.site,
       //审核详情
@@ -1070,9 +1080,22 @@ export default {
     this.getLanguageList()
     this.initTblBaseDataList()
     this.initSupplier()
+    this.getPartFamily()
   },
 
   methods: {
+    getPartFamily(){
+      let jsonData = {
+        site : this.site,
+        active : 'Y',
+      }
+      this.selectList.select1 = []
+      getPartFamilyList(jsonData).then(({data}) => {
+        if (data.success) {
+          this.selectList.select1 = data.rows
+        }
+      })
+    },
     //获取申请单号文件信息
     getFileList(row) {
       let jsonData = {