Merge remote-tracking branch 'origin/master'

src/api/part/partInformation.js

@@ -309,3 +309,8 @@ export const getPartRevisionEngChgLevel = data => createAPI(`/plm/partInformatio
 
 export const queryPartUnitCostList = data => createAPI(`/plm/partInformation/queryPartUnitCostList`,'post',data)
 
+export const getItemListByCodeNo = data => createAPI(`/plm/partInformation/getItemListByCodeNo`,'post',data)
+
+export const getItemExclusionAlreadyExists = data => createAPI(`/plm/partInformation/getItemExclusionAlreadyExists`,'post',data)
+
+export const getPartCharacteristicList = data => createAPI(`/plm/partInformation/getPartCharacteristicList`,'post',data)

src/api/processManagement/processManagement.js

@@ -92,4 +92,7 @@ export const saveAuthorityList = data => createAPI(`/plm/request/saveAuthorityLi
 export const editNodeInfo = data => createAPI(`/plm/request/editNodeInfo`,'post',data)
 
 
+export const getProcessControlList = data => createAPI(`/plm/request/getProcessControlList`,'post',data)
 
+
+export const saveProcessControlList = data => createAPI(`/plm/request/saveProcessControlList`,'post',data)

src/views/modules/part/bomManagement.vue

@@ -431,6 +431,7 @@
         </el-table>
         <!-- 分页插件 -->
         <el-pagination
+          style="margin-top: 5px"
           @size-change="sizeChangeHandle2"
           @current-change="currentChangeHandle2"
           :current-page="pageIndex2"
@@ -440,7 +441,7 @@
           layout="total, sizes, prev, pager, next, jumper">
         </el-pagination>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="partModelFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -488,6 +489,7 @@
       </el-table>
       <!-- 分页插件 -->
       <el-pagination
+        style="margin-top: 5px"
         @size-change="sizeChangeHandle3"
         @current-change="currentChangeHandle3"
         :current-page="pageIndex3"
@@ -783,6 +785,7 @@
       </el-table>
       <!-- 分页插件 -->
       <el-pagination
+        style="margin-top: 5px"
         @size-change="sizeChangeHandle4"
         @current-change="currentChangeHandle4"
         :current-page="pageIndex4"

src/views/modules/processManagement/processBindingInfo.vue

@@ -171,12 +171,13 @@
             fixed="right"
             header-align="center"
             align="center"
-            width="160"
+            width="200"
             label="操作">
             <template slot-scope="scope">
               <el-link style="cursor: pointer" @click="editNodeModal(scope.row)">编辑</el-link>
               <el-link style="cursor: pointer" @click="subDetailModal(scope.row)">出口配置</el-link>
               <el-link style="cursor: pointer" @click="authorityModal(scope.row)">权限配置</el-link>
+              <el-link style="cursor: pointer" @click="processControlModal(scope.row)">特殊管控</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -373,7 +374,36 @@
         <el-button type="primary" @click="nodeModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog width="700px" title="特殊管控" :close-on-click-modal="false" :visible.sync="controlFlag">
+      <el-table
+        :data="controlList"
+        border
+        :height="400"
+        v-loading="false"
+        ref="controlTable"
+        @selection-change="handleSelectionChange">
+        style="width: 100%;">
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          :selectable="selectFlag"
+          width="50">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="left"
+          min-width="600"
+          label="描述">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
 
+        <el-button type="primary" @click="saveControl">保存</el-button>
+        <el-button type="primary" @click="controlFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <!-- chooseList模态框 -->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -394,6 +424,8 @@
     getAuthorityFieldList, // 获取权限字段集合
     saveAuthorityList, // 保存节点权限
     editNodeInfo, // 修改节点
+    getProcessControlList,
+    saveProcessControlList,
   } from '@/api/processManagement/processManagement.js'
   import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js"
   import Chooselist from '@/views/modules/common/Chooselist'
@@ -919,7 +951,16 @@
         modalFlag: false,
         authorityFlag: false,
         nodeModalFlag: false,
-        nodeModalDisableFlag: false
+        nodeModalDisableFlag: false,
+        controlFlag: false,
+        controlList:[],
+        controlSelection:[],
+        controlData:{
+          site:'',
+          workflowId:'',
+          nodeId:'',
+          detailData:'',
+        },
       }
     },
 
@@ -1027,7 +1068,50 @@
         })
         this.authorityFlag = true
       },
+      processControlModal(row){
+        this.controlData.site=row.site
+        this.controlData.workflowId=row.workflowId
+        this.controlData.nodeId=row.nodeId
+        getProcessControlList(this.controlData).then(({data})=>{
+          if (data && data.code === 0) {
+            this.controlList=data.rows
+            this.controlSelection=data.select
+            // this.$refs.controlTable.toggleAllSelection()
+            this.controlList.forEach(val => {
+              // 回显选中
+              for (let i = 0; i <this.controlSelection.length ; i++) {
+                if(this.controlSelection[i].roleId===val.roleId){
+                  this.$nextTick(() => this.$refs.controlTable.toggleRowSelection(val, true))
+                }
+              }
+            })
+            this.controlFlag=true
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+
 
+
+      },
+      saveControl(){
+        this.controlData.detailData=this.controlSelection
+        saveProcessControlList(this.controlData).then(({data})=>{
+          if (data && data.code === 0) {
+            this.controlFlag=false
+            this.$message.success( '操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      handleSelectionChange(val) {
+        this.controlSelection = val;
+      },
       // 表改变事件
       tableChange3 () {
         getAuthorityFieldList(this.authorityData).then(({data}) => {

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue

@@ -472,6 +472,7 @@
         });
         tsdBasicInformationSearch(this.searchData).then(({data}) => {
           this.baseForm=data.row;
+          this.bomData.site=data.row.site
           this.bomData.partNo=data.row.finalPartNo
           this.getNodeAuthority(data.row)
         })

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -984,6 +984,7 @@
           if(data&& data.code===0){
             this.sheetData=data.row
             this.baseForm=data.row;
+            this.routeData.site=data.row.site
             this.routeData.partNo=data.row.finalPartNo
             this.getNodeAuthority(data.row)
           }else {

src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@@ -794,7 +794,7 @@
           }
           issueChange(tempData).then(({data}) => {
             if (data && data.code === 0) {
-              this.search()
+              this.refresh()
               this.$message({message: '操作成功', type: 'success'})
             } else {
               this.$alert(data.msg, '错误', {

src/views/modules/tooling/searchToolApply.vue

@@ -91,6 +91,9 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+      <el-tab-pane label="基本信息" name="attribute">
+        <order-attribute ref="dialogAttribute" :order-no="currentRow.applyNo" :code-no="'toolApply'" :function-type="'order'"></order-attribute>
+      </el-tab-pane>
       <el-tab-pane label="工具明细" name="detail">
         <el-table
           :data="detailList"
@@ -582,7 +585,7 @@
   import ApprovalInformation from "../changeManagement/approvalInformation.vue";
   import OssComponents from "../oss/ossComponents";
   import DictDataSelect from "../sys/dict-data-select.vue"
-
+  import orderAttribute from "../demoComponents/orderProperties"
   /*組件*/
   export default {
     components: {
@@ -591,6 +594,7 @@
       Chooselist,
       projectUploadFile,
       DictDataSelect,
+      orderAttribute,
     },
     computed: {
       changeApplyHeaderFlag() {