更新

src/api/Outsourcing/OutFactoryMaintenance.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询按钮功能实现
+// 查询
 export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, num5, phNumber, num6, Fax, num7, Remarks, num8, category, num11, attention, num9, EquipmentCondition) {
   return request({
     url: '',
@@ -13,7 +13,7 @@ export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num
     }
   })
 }
-// 增加按钮功能
+// 增加
 export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
   return request({
     url: '',
@@ -25,7 +25,7 @@ export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbre
     }
   })
 }
-// 编辑按钮功能
+// 编辑
 export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
   return request({
     url: '',
@@ -37,7 +37,7 @@ export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, Manuf
     }
   })
 }
-// 删除按钮功能
+// 删除
 export function handledelete(CoManufacturerFlowNumber) {
   return request({
     url: '',

src/views/ManufacturingCenter/OwnTimeStatistics/index.vue

@@ -90,6 +90,8 @@ export default {
       }
       if (this.date1 === '' || this.date1 === null || this.date2 === '' || this.date2 === null) {
         this.check2 = 0
+        this.date1 = ''
+        this.date2 = ''
       } else {
         this.check2 = 1
       }

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -555,6 +555,7 @@ import {
   searchRecord
 } from '@/api/ManufacturingCenter/ProcessPlanning'
 import elInput from 'element-ui/packages/input'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
@@ -667,6 +668,14 @@ export default {
       material2: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id'
+    ])
+  },
   created() {
     this.fetchData()
     this.initPerson()

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -260,6 +260,11 @@ export default {
       if (this.radio === 2) { // 全部
         getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
           this.total = response.data.total
+          for (let i = 0; i < response.data.rows.length; i++) {
+            response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
+            response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
+            response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
+          }
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
               零件号: response.data.rows[i].零件图号,

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -98,6 +98,7 @@
 
 <script>
 import { getPerson, mainTable, getPartnames1, getPartnames2, detailInfo, mainTable1, TableAddLi, TableAddLi1 } from '@/api/ManufacturingCenter/QuotaFormulation'
+import { mapGetters } from 'vuex'
 
 export default {
   data() {
@@ -171,6 +172,14 @@ export default {
       timeout: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id'
+    ])
+  },
   created() {
     this.fetchData()
   },

src/views/Outsourcing/OutFactoryMaintenance/index.vue

@@ -37,38 +37,28 @@
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-        <el-table-column label="电话" align="center" width="140px">
+        <el-table-column label="电话" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column label="传真" align="center" width="120px">
+        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备情况" align="center" width="230px">
-          <template slot-scope="scope">
-            {{ scope.row.设备情况 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
+        <el-table-column label="操作" align="center" width="150px" fixed="right">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
               class="el-icon-edit"
               @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-            <el-button
+              <!--<el-button-->
-              size="mini"
+              <!--size="mini"-->
-              type="danger"
+              <!--type="danger"-->
-              class="el-icon-delete"
+              <!--class="el-icon-delete"-->
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <!--@click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
           </template>
         </el-table-column>
       </el-table>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -1599,6 +1599,17 @@ export default {
     height: 30px;
     text-align:center;
   }
+  .el-table .chengjiao {
+    background: #AEF199;
+  }
+  .el-input__inner {
+    height: 30px;
+  }
+</style>
+<style>
+  .el-table .chajia {
+    background: #EBF953;
+  }
   #tableHead td{
     border:1px solid black;
   }
@@ -1615,13 +1626,4 @@ export default {
     width: 7%;
     text-align: left;
   }
-  .el-table .chajia {
-    background: #EBF953;
-  }
-  .el-table .chengjiao {
-    background: #AEF199;
-  }
-  .el-input__inner {
-    height: 30px;
-  }
 </style>

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -89,6 +89,7 @@
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===4" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工艺编号)===29" size="small">备料</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
           </template>
         </el-table-column>