Bug Fixes

src/api/production.js

@@ -153,3 +153,11 @@ export function getDamageDetail (mouldId) {
     method: 'get'
   })
 }
+
+// 重新安排生产
+export function reSchedule (recordId) {
+  return request({
+    url: request.adornUrl(`/biz-service/damage/update/${recordId}`),
+    method: 'get'
+  })
+}

src/views/modules/check/product-check.vue

@@ -35,7 +35,7 @@
         prop="prodCode"
         header-align="center"
         align="center"
-        width="120"
+        width="140"
         :show-tooltip-when-overflow="true"
         label="产品编号">
       </el-table-column>
@@ -43,7 +43,7 @@
         prop="techName"
         header-align="center"
         align="center"
-        width="120"
+        width="160"
         :show-tooltip-when-overflow="true"
         label="工艺名称">
       </el-table-column>
@@ -66,7 +66,7 @@
         prop="recordsNote"
         header-align="center"
         align="center"
-        width="120"
+        width="160"
         :show-tooltip-when-overflow="true"
         label="记录说明">
       </el-table-column>
@@ -74,7 +74,6 @@
         prop="operation"
         header-align="center"
         align="center"
-        min-width="120"
         label="检验员">
       </el-table-column>
       <el-table-column
@@ -84,14 +83,14 @@
         min-width="160"
         label="检验时间">
       </el-table-column>
-      <el-table-column
-        prop="notes"
-        header-align="center"
-        align="center"
-        width="160"
-        :show-tooltip-when-overflow="true"
-        label="备注">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="notes"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="160"-->
+<!--        :show-tooltip-when-overflow="true"-->
+<!--        label="备注">-->
+<!--      </el-table-column>-->
       <el-table-column
         fixed="right"
         header-align="center"

src/views/modules/production/damage.vue

@@ -98,12 +98,20 @@
         label="报损说明">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="createTime"
         header-align="center"
         align="center"
         min-width="160"
         label="报损时间">
       </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        :formatter="formatState"
+        min-width="120"
+        label="状态">
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -111,7 +119,8 @@
         width="140"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="detailHandle(scope.row.recordId)">查看</el-button>
+          <el-button v-if="isAuth('prod:damage:info')" type="text" size="small" @click="detailHandle(scope.row.recordId)">查看</el-button>
+          <el-button v-if="isAuth('prod:damage:again') && Number(scope.row.state) !== 2" type="text" size="small" @click="reScheduleHandle(scope.row.recordId)">重新排产</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -130,7 +139,7 @@
 
 <script>
   import Detail from './damage-details'
-  import { getDamageList } from '@/api/production'
+  import { getDamageList, reSchedule } from '@/api/production'
   export default {
     name: 'damage',
     components: {Detail},
@@ -206,6 +215,30 @@
         this.$nextTick(() => {
           this.$refs.detail.init(id)
         })
+      },
+      // 状态
+      formatState (row) {
+        if (!row.state) return ''
+        if (Number(row.state) === 1) return '未重新排产'
+        if (Number(row.state) === 2) return '已重新排产'
+        return ''
+      },
+      // 重新排产
+      reScheduleHandle (id) {
+        reSchedule(id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
       }
     }
   }

src/views/modules/production/recording.vue

@@ -55,6 +55,15 @@
         :show-tooltip-when-overflow="true"
         label="客户名称">
       </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        label="状态">
+        <template slot-scope="scope">
+          <span>{{scope.row.state?optionsState[Number(scope.row.state) - 3].value:''}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -95,7 +104,21 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        dataListSelections: []
+        dataListSelections: [],
+        optionsState: [
+          {
+            code: '3',
+            value: '完成'
+          },
+          {
+            code: '4',
+            value: '不合格'
+          },
+          {
+            code: '5',
+            value: '报废'
+          }
+        ]
       }
     },
     created () {

src/views/modules/works/work.vue

@@ -53,7 +53,7 @@
         prop="endTime"
         header-align="center"
         align="center"
-        min-width="140"
+        min-width="160"
         label="规定完成时间">
       </el-table-column>
       <el-table-column