111

src/views/modules/processManagement/processBindingInfo.vue

@@ -1201,7 +1201,10 @@
             this.queryTableParam = {
               tableType: 'plm_project_tool_applyHeader',
               passTable: [],
-              addTable: []
+              addTable: [
+                'plm_project_tool_applyHeader',
+                'plm_project_tool_applyDetail'
+              ]
             }
           } else {
             return

src/views/modules/tooling/searchToolApply.vue

@@ -58,6 +58,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="comfirmApply(scope.row)">下达</a>
+          <a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="editModalU(scope.row)">修改</a>
           <a type="text" size="small" v-if="scope.row.status=='审批中'" @click="editModal(scope.row)">审批</a>
           <a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="cancelApply(scope.row)">取消申请</a>
         </template>
@@ -236,7 +237,7 @@
       width="800px" v-drag
       :title="'刀模申请修改'"
       :close-on-click-modal="false"
-      :visible.sync="visible">
+      :visible.sync="visibleU">
       <el-form :inline="true" label-position="top" label-width="100px" >
         <el-form-item :label="'申请编号'">
           <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
@@ -319,9 +320,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>
-        <el-button type="primary" @click="visible = false">{{'取消'}}</el-button>
-        <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
+        <el-button type="primary" @click="visibleU = false">{{'取消'}}</el-button>
       </span>
     </el-dialog>
 
@@ -411,7 +410,7 @@
        </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>
+<!--        <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>-->
         <el-button type="primary" @click="visible = false">{{'取消'}}</el-button>
         <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
         <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
@@ -539,6 +538,7 @@
           endDate:'',
         },
         toolData:[],
+        visibleU:false,
         dataForm:{
           site: '',
           applyNo: '',
@@ -1402,6 +1402,39 @@
         })
         this.visible=true
       },
+      editModalU (row) {
+        this.getNodeAuthority(row)
+        this.dataForm = {
+          site: row.site,
+          applyNo: row.applyNo,
+          applyBy: row.applyBy,
+          applyDate: row.applyDate,
+          applySumQty: row.applySumQty,
+          applyReason: row.applyReason,
+          remark: row.remark,
+          createBy: row.createBy,
+          department:row.department,
+          detailList: [],
+          status: row.status,
+          rejectOpinion: '',
+          nodeConclusion: '',
+          quoter: row.quoter,
+          quoterName: row.quoterName,
+          tp: row.tp,
+          tpName: row.tpName,
+          purchaser: row.purchaser,
+          purchaserName: row.purchaserName,
+          menuId: this.$route.meta.menuId,
+          userName: this.$store.state.user.name,
+        }
+        searchProjectToolApplyDetail({ site: row.site,
+          applyNo: row.applyNo,}).then(({data}) => {
+          if (data.code == 0) {
+            this.toolData = data.rows
+          }
+        })
+        this.visibleU=true
+      },
       comfirmApply (row) {
         this.$confirm(`确定下达这个申请`, '提示', {
           confirmButtonText: '确定',
@@ -1663,6 +1696,7 @@
               }
             }
             this.visible = false
+            this.visibleU = false
             this.refreshCurrentTabTable()
             this.$message({
               message: '操作成功',