更新

src/api/ManufacturingCenter/ProcessPlanning.js

@@ -353,7 +353,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
+      name: ' ',
       param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
     }
   })

src/api/TechnologyCenter/CreatePackingList.js

@@ -57,6 +57,18 @@ export function deleteReciptData(num) {
   })
 }
 
+export function deleteGroupData(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'PDM_装箱单_机床所属部件_删除数据',
+      param: `部件编号=${num}`
+    }
+  })
+}
+
 export function getMachineData(num) {
   return request({
     url: '',
@@ -129,18 +141,6 @@ export function editGroupData(num, num1, num2, num3, num4, num5) {
   })
 }
 
-export function deleteGroupData(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: 'PDM_装箱单_部件_删除数据',
-      param: `部件编号=${num}`
-    }
-  })
-}
-
 export function machineSelect(projectValue) {
   return request({
     url: '',

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -1172,9 +1172,9 @@ export default {
       searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.tuhao.push({
-            value: response.data[i].零件图号,
+            label: response.data[i].零件图号,
             name: response.data[i].零件名称,
-            num: response.data[i].工艺计划流水号
+            value: response.data[i].工艺计划流水号
           })
         }
       })
@@ -1194,10 +1194,11 @@ export default {
     numChange1() {
       this.remark1 = ''
       this.tableData4 = null
+      console.log(this.tuhaoValue)
       for (let i = 0; i < this.tuhao.length; i++) {
         if (this.tuhaoValue === this.tuhao[i].value) {
           this.remark1 = this.tuhao[i].name
-          this.num = this.tuhao[i].num
+          this.num = this.tuhao[i].value
         }
       }
       gongyiYQ(this.num).then(response => {

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -89,6 +89,21 @@
                 <span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="审图（计划开始）" align="center" min-width="170px">
+              <template slot-scope="scope">
+                {{ scope.row.审图计划开始时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="审图（计划完成）" align="center" min-width="170px">
+              <template slot-scope="scope">
+                <span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="审图（实际完成）" align="center" min-width="170px">
+              <template slot-scope="scope">
+                <span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="发图" align="center" min-width="140px">
               <template slot-scope="scope">
                 <span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间.split(' ')[0] }}</span>

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -114,6 +114,15 @@
                 align="center"
                 label="备注"
               ><template slot-scope="scope">{{ scope.row.备注 }}</template></el-table-column>
+              <el-table-column label="操作" fixed="right" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </template>
         </el-table-column>
@@ -580,7 +589,7 @@
 </template>
 
 <script>
-import { projectSelect, getReciptData, insertReciptData, updateReciptData, deleteReciptData, getMachineData, getGroupData, machineSelect, addMachineData, updateMachineData, deleteMachineData, getFileData, addFileData, editFileData, deleteFileData, getSpareData, addSpareData, editSpareData, deleteSpareData } from '@/api/TechnologyCenter/CreatePackingList'
+import { projectSelect, getReciptData, insertReciptData, updateReciptData, deleteReciptData, getMachineData, getGroupData, machineSelect, addMachineData, updateMachineData, deleteMachineData, getFileData, addFileData, editFileData, deleteFileData, getSpareData, addSpareData, editSpareData, deleteSpareData, deleteGroupData } from '@/api/TechnologyCenter/CreatePackingList'
 import $ from 'jquery'
 export default {
   data() {
@@ -774,6 +783,11 @@ export default {
         this.getReceipt()
       })
     },
+    handleDelete(row) {
+      this.deleteRow(deleteGroupData, row.部件编号, function() {
+        this.getMachineData()
+      })
+    },
     cancel() {
       this.receiptVisible = false
       this.machineVisible = false