plm BM

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

@@ -299,6 +299,7 @@
           updateBMCutDetail(this.dataForm).then(({data}) => {
             if (data && data.code === 0) {
               this.$message.success( '操作成功')
+              this.$emit("closeModel")
             } else {
               this.$message.error(data.msg)
             }

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

@@ -297,37 +297,37 @@
         <overprinting ref="overprinting" @closeModel="closeModel"></overprinting>
       </div>
       <div v-else-if="currentRow.itemType === 'slitting'">
-        <slitting ref="slitting"></slitting>
+        <slitting ref="slitting" @closeModel="closeModel"></slitting>
       </div>
       <div v-else-if="currentRow.itemType === 'lamTemperature'">
-        <lamTemperature ref="lamTemperature"></lamTemperature>
+        <lamTemperature ref="lamTemperature" @closeModel="closeModel"></lamTemperature>
       </div>
       <div v-else-if="currentRow.itemType === 'cutting'">
-        <cutting ref="cutting"></cutting>
+        <cutting ref="cutting" @closeModel="closeModel"></cutting>
       </div>
       <div v-else-if="currentRow.itemType === 'InkMixing'">
-        <InkMixing ref="InkMixing"></InkMixing>
+        <InkMixing ref="InkMixing" @closeModel="closeModel"></InkMixing>
       </div>
       <div v-else-if="currentRow.itemType === 'InkFormulation'">
-        <InkFormulation ref="InkFormulation"></InkFormulation>
+        <InkFormulation ref="InkFormulation" @closeModel="closeModel"></InkFormulation>
       </div>
       <div v-else-if="currentRow.itemType === 'lamination'">
-        <lamination ref="lamination"></lamination>
+        <lamination ref="lamination" @closeModel="closeModel"></lamination>
       </div>
       <div v-else-if="currentRow.itemType === 'CNC'">
-        <CNC ref="CNC"></CNC>
+        <CNC ref="CNC" @closeModel="closeModel"></CNC>
       </div>
       <div v-else-if="currentRow.itemType === 'Cut'">
-        <Cut ref="Cut"></Cut>
+        <Cut ref="Cut" @closeModel="closeModel"></Cut>
       </div>
       <div v-else-if="currentRow.itemType === 'packagePage'">
-        <packagePage ref="packagePage"></packagePage>
+        <packagePage ref="packagePage" @closeModel="closeModel"></packagePage>
       </div>
       <div v-else-if="currentRow.itemType === 'fqc'">
-        <fqc ref="fqc"></fqc>
+        <fqc ref="fqc" @closeModel="closeModel"></fqc>
       </div>
       <div v-else-if="currentRow.itemType === 'cqc'">
-        <cqc ref="cqc"></cqc>
+        <cqc ref="cqc" @closeModel="closeModel"></cqc>
       </div>
     </el-dialog>
     <el-dialog title="变更工艺路线" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="700px">

src/views/modules/tooling/searchToolApply.vue

@@ -173,7 +173,8 @@
       <el-tab-pane label="审批信息" name="tab3"></el-tab-pane>
       <el-tab-pane label="处理信息" name="tab4">
         <el-form :inline="true" label-position="top" style="margin-top: 0px">
-          <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>
+<!--          <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>-->
+          <el-button type="primary"  @click="openMassageModel()">申请信息录入</el-button>
         </el-form>
         <el-form label-position="top"  :model="currentRow" >
           <el-row :gutter="15">
@@ -221,7 +222,7 @@
       :close-on-click-modal="false"
       :visible.sync="modelFlag">
       <el-form label-position="top"  >
-        <el-row :gutter="15" v-if="this.currentRow.statusCode==='50'">
+        <el-row :gutter="15" >
           <el-col :span="6">
             <el-form-item label="IFS PR编号" >
               <el-input v-model="modelData.prNo"  ></el-input>
@@ -233,7 +234,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="15" style="margin-top: 20px" v-if="this.currentRow.statusCode==='60'">
+        <el-row :gutter="15" style="margin-top: 20px" >
           <el-col :span="6">
             <el-form-item label="采购订单号" >
               <el-input v-model="modelData.poNo"  ></el-input>
@@ -322,6 +323,7 @@
         },
         modelFlag:false,
         currentRow:{},
+        currentRow2:{},
         height: 200,
         dataList1:[],
         detailList:[],
@@ -826,6 +828,7 @@
       //单击切换订单
       changeData(row) {
         this.currentRow = JSON.parse(JSON.stringify(row));
+        this.currentRow2 = row;
         this.refreshCurrentTabTable ();
         },
       addUploadFileModal(){
@@ -895,7 +898,8 @@
         }).then(() => {
         comfirmToolApply(row).then(({data}) => {
           if (data && data.code === 0) {
-            this. search ();
+           row.statusCode='10'
+            row.status='下达'
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1030,6 +1034,13 @@
               this.currentRow.supplierName=this.modelData.supplierName
               this.currentRow.allCost=this.modelData.allCost
               this.currentRow.remark2=this.modelData.remark2
+
+              this.currentRow2.prNo=this.modelData.prNo
+              this.currentRow2.remark1=this.modelData.remark1
+              this.currentRow2.poNo=this.modelData.poNo
+              this.currentRow2.supplierName=this.modelData.supplierName
+              this.currentRow2.allCost=this.modelData.allCost
+              this.currentRow2.remark2=this.modelData.remark2
               this.$message({
                 message: '操作成功',
                 type: 'success',

src/views/modules/tooling/toolingInfo.vue

@@ -241,10 +241,10 @@
         <el-form-item :label="'申请编号'">
           <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
         </el-form-item>
-        <el-form-item :label="'申请人'">
+        <el-form-item :label="'申请人'" required="required">
           <el-input v-model="dataForm.applyBy" style="width: 130px" ></el-input>
         </el-form-item>
-        <el-form-item :label="'申请日期'">
+        <el-form-item :label="'申请日期'" required="required">
           <el-date-picker
             value-format="yyyy-MM-dd"
             style="width: 100%"