Merge remote-tracking branch 'origin/master'

src/api/sampleManagement/technicalSpecificationList.js

@@ -120,3 +120,6 @@ export const submitChange= data => createAPI(`/technicalSpecification/submitChan
 export const getBMStatusDesc= data => createAPI(`/technicalSpecification/getBMStatusDesc`,'post',data)
 
 export const getFinalPartData= data => createAPI(`/technicalSpecification/getFinalPartData`,'post',data)
+
+
+export const getOADetailForBM= data => createAPI(`/technicalSpecification/getOADetailForBM`,'post',data)

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

@@ -1,6 +1,8 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
+      <el-row :gutter="20">
+        <el-col :span="18">
       <el-form-item  label="物料">
         <el-input v-model="bomData.partNo" readonly style="width: 120px"></el-input>
       </el-form-item>
@@ -21,7 +23,20 @@
         <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
 <!--        <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
       </el-form-item>
-
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'当前节点'" style="width: 100%">
+            <el-input v-model="spForm.nodeName" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'审批人'" style="width: 100%">
+            <el-input v-model="spForm.sp" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+      </el-row>
       <el-table
         :data="bomList"
         :height="height"
@@ -142,6 +157,7 @@
     updateBMBomRev,
     tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
+    getOADetailForBM,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -379,7 +395,10 @@
           isReject:'',
         },
 
-
+        spForm:{
+          sp:'',
+          nodeName:'',
+        },
         ifDisableFlag:false,
         rejectOpinion: '',
         submitModalFlag: false,
@@ -439,6 +458,10 @@
 
       },
       searchTable(){
+        getOADetailForBM(this.searchData).then(({data}) => {
+          this.spForm.nodeName = data.row.nodeName
+          this.spForm.sp = data.row.sp
+        })
         searchBMBom(this.searchData).then(({data}) => {
           if(data&& data.code===0){
             this.bomList = data.rows;

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

@@ -1,10 +1,28 @@
 <template>
   <div class="mod-config" v-highlight-container>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-row :gutter="20">
+        <el-col :span="18">
+          <el-form-item label=" " style="width: 100%">
       <el-button type="primary" @click="refresh()" >刷新数据</el-button>
       <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
       <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
       <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'当前节点'" style="width: 100%">
+            <el-input v-model="spForm.nodeName" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'审批人'" style="width: 100%">
+            <el-input v-model="spForm.sp" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+      </el-row>
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-row :gutter="20">
@@ -109,7 +127,8 @@
 
       <el-row :gutter="20" style="margin-top: 60px">
         <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'附加客户图纸/Attach Customer Drawing'">
+          <el-form-item >
+            <span slot="label" style="" @click="openNewPage(dataForm.pictureAddess)"><a herf="#">附加客户图纸/Attach Customer Drawing(点击跳转)</a></span>
             <el-input  v-model="dataForm.pictureAddess" :disabled="ifDisableFlag" ></el-input>
           </el-form-item>
         </div></el-col>
@@ -187,6 +206,8 @@
     updateBMcustomerInfo,
     tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
+    getOADetailForBM,
+    checkUrl,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -210,6 +231,10 @@
           status:'',
           isReject:'',
         },
+        spForm:{
+          sp:'',
+          nodeName:'',
+        },
         dataForm:{
           materialType:'',
           site: '',
@@ -301,6 +326,10 @@
           this.baseForm=data.row;
           this.getNodeAuthority(data.row)
         })
+        getOADetailForBM(this.searchData).then(({data}) => {
+          this.spForm.nodeName = data.row.nodeName
+          this.spForm.sp = data.row.sp
+        })
         searchBMcustomerInfo(this.searchData).then(({data}) => {
           if(data.rows.length>0){
             this.dataForm = data.rows[0];
@@ -316,6 +345,10 @@
         });
       },
       searchTable(){
+        getOADetailForBM(this.searchData).then(({data}) => {
+          this.spForm.nodeName = data.row.nodeName
+          this.spForm.sp = data.row.sp
+        })
         tsdBasicInformationSearch(this.searchData).then(({data}) => {
           this.baseForm=data.row;
           this.getNodeAuthority(data.row)
@@ -420,6 +453,30 @@
           this.submitData(tempData)
         })
       },
+      openNewPage(url){
+        // window.open(this.$store.state.user.bmPicUrl +url);
+        let urlIn=url.replaceAll('\\','/')
+        if(url==null||url===''){
+          this.$alert("链接没有数据！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        // window.open(url);
+        let data={
+          url:urlIn
+        }
+        checkUrl(data).then(({data}) => {
+          if (data && data.code === 0) {
+            window.open(data.url);
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        });
+
+      },
       submitData (tempData) {
 
         updateBMcustomerInfo(this.dataForm).then(({data}) => {

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

@@ -4,6 +4,8 @@
 <!--      <el-form-item :label="'技术参数卡编码'">-->
 <!--        <el-input v-model="searchData.oriCodeNo" readonly style="width: 150px"  ></el-input>-->
 <!--      </el-form-item>-->
+      <el-row :gutter="20">
+        <el-col :span="18">
       <el-form-item :label="'属性模板编码'">
         <el-input v-model="searchData.propertiesCodeNo" readonly style="width: 150px"  ></el-input>
       </el-form-item>
@@ -14,6 +16,20 @@
         <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
         <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
       </el-form-item>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'当前节点'" style="width: 100%">
+            <el-input v-model="spForm.nodeName" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'审批人'" style="width: 100%">
+            <el-input v-model="spForm.sp" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+      </el-row>
       <div class="rq ">
         <el-table
           :height="height"
@@ -111,6 +127,7 @@
     checkUrl,
     tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
+    getOADetailForBM,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -140,6 +157,10 @@
           status:'',
           isReject:'',
         },
+        spForm:{
+          sp:'',
+          nodeName:'',
+        },
         rejectOpinion: '',
         submitModalFlag: false,
       }
@@ -170,6 +191,10 @@
 
       },
       searchTable(){
+        getOADetailForBM(this.searchData).then(({data}) => {
+          this.spForm.nodeName = data.row.nodeName
+          this.spForm.sp = data.row.sp
+        })
         searchBMPropertiesValue(this.searchData).then(({data}) => {
 
           this.tableData = data.rows;

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

@@ -1,22 +1,39 @@
 <template>
   <div class="mod-config" v-highlight-container>
     <el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
-      <el-form-item  label="Process">
-        <dict-data-select :site="searchData.site" v-if="searchData.site"  v-model="sheetData.process" dict-type="bm_process" style="width: 120px"></dict-data-select>
-      </el-form-item>
-      <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1)"><a herf="#">热转移打印人员</a></span>
-          <el-input v-model="sheetData.overPrintOperatorName" ref="overPrintOperatorName" placeholder="请选择人员" readonly style="width: 120px" ></el-input>
-      </el-form-item>
-      <el-form-item  >
-        <span slot="label" style="" @click="getBaseList(2)"><a herf="#">印刷人员</a></span>
-        <el-input v-model="sheetData.printOperatorName" ref="printOperatorName"  placeholder="请选择人员" readonly style="width: 120px" ></el-input>
-      </el-form-item>
-      <el-form-item  label=" ">
-        <el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
-        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
-      </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item  label="Process">
+              <dict-data-select :site="searchData.site" v-if="searchData.site"  v-model="sheetData.process" dict-type="bm_process" style="width: 120px"></dict-data-select>
+            </el-form-item>
+            <el-form-item >
+                <span slot="label" style="" @click="getBaseList(1)"><a herf="#">热转移打印人员</a></span>
+                <el-input v-model="sheetData.overPrintOperatorName" ref="overPrintOperatorName" placeholder="请选择人员" readonly style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  >
+              <span slot="label" style="" @click="getBaseList(2)"><a herf="#">印刷人员</a></span>
+              <el-input v-model="sheetData.printOperatorName" ref="printOperatorName"  placeholder="请选择人员" readonly style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label=" ">
+              <el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
+              <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
+              <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3"><div class="grid-content bg-purple">
+            <el-form-item :label="'当前节点'" style="width: 100%">
+              <el-input v-model="spForm.nodeName" disabled  ></el-input>
+            </el-form-item>
+          </div>
+          </el-col>
+          <el-col :span="3"><div class="grid-content bg-purple">
+            <el-form-item :label="'审批人'" style="width: 100%">
+              <el-input v-model="spForm.sp" disabled  ></el-input>
+            </el-form-item>
+          </div>
+          </el-col>
+        </el-row>
+
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo=='RDC'">
       <el-row :gutter="20" >
@@ -455,6 +472,7 @@
     tsdBasicInformationSearch,
     updateBMProcess,
     submitChange,getBMStatusDesc, // 提交
+    getOADetailForBM,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -507,6 +525,10 @@
 
     data() {
       return {
+        spForm:{
+          sp:'',
+          nodeName:'',
+        },
         //动态组件
         selectedComponent: null,
         routeData:{
@@ -968,6 +990,10 @@
           }
 
         });
+        getOADetailForBM(this.searchData).then(({data}) => {
+          this.spForm.nodeName = data.row.nodeName
+          this.spForm.sp = data.row.sp
+        })
         if(this.searchData.buNo==='RDC'){
           searchBMRoutingDetail(this.searchData).then(({data}) => {
             if(data&& data.code===0){

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

@@ -1,10 +1,29 @@
 <template>
   <div class="mod-config"  v-highlight-container>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-button type="primary" @click="refresh()" >刷新数据</el-button>
-      <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
-      <el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
-      <el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
+      <el-row :gutter="20">
+        <el-col :span="18"><div class="grid-content bg-purple">
+      <el-form-item :label="' '">
+        <el-button type="primary" @click="refresh()" >刷新数据</el-button>
+        <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
+        <el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
+      </el-form-item>
+        </div>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'当前节点'" >
+            <el-input v-model="spForm.nodeName" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+        <el-col :span="3"><div class="grid-content bg-purple">
+          <el-form-item :label="'审批人'" >
+            <el-input v-model="spForm.sp" disabled  ></el-input>
+          </el-form-item>
+        </div>
+        </el-col>
+      </el-row>
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-row :gutter="20">
@@ -26,11 +45,7 @@
             <el-input v-model="dataForm.finalPartNo" disabled  ></el-input>
           </el-form-item>
         </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'当前节点'">
-            <el-input v-model="dataForm.nodeName" disabled  ></el-input>
-          </el-form-item>
-        </div></el-col>
+
 <!--        <el-col :span="6"><div class="grid-content bg-purple">-->
 <!--          <el-form-item :label="'P/N Rev.'">-->
 <!--            <el-input v-model="dataForm.partRevNo" disabled  ></el-input>-->
@@ -271,7 +286,7 @@
     tsdBasicInformationSearch,
     searchTechnicalSpecificationTeamStr,
     updateBMBasicInformation,
-    searchPartLastQuotationNo,getBMStatusDesc,
+    searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM,
     submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
@@ -302,6 +317,10 @@
         quotationOfficerList:[],
         engineerList:[],
         technicianList:[],
+        spForm:{
+          sp:'',
+          nodeName:'',
+        },
         dataForm:{
           nodeName:'',
           process:'',
@@ -496,6 +515,10 @@
               codeNo: this.dataForm.codeNo,
               type: 'quotationOfficer',
             }
+            getOADetailForBM(inData).then(({data}) => {
+              this.spForm.nodeName = data.row.nodeName
+              this.spForm.sp = data.row.sp
+            })
             searchTechnicalSpecificationTeamStr(inData).then(({data}) => {
               this.dataForm.quotationOfficerList = data.rows
             })
@@ -546,6 +569,10 @@
             searchTechnicalSpecificationTeamStr(inData).then(({data}) => {
               this.dataForm.quotationOfficerList = data.rows
             })
+            getOADetailForBM(inData).then(({data}) => {
+              this.spForm.nodeName = data.row.nodeName
+              this.spForm.sp = data.row.sp
+            })
             let inData2 = {
               site: this.dataForm.site,
               codeNo: this.dataForm.codeNo,