Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/api/check.js

@@ -50,3 +50,19 @@ export function getIncomingInspection2 (id) {
     method: 'get'
   })
 }
+
+// 获取成品检验信息
+export function getFinishedInspectionDetail (id) {
+  return request({
+    url: request.adornUrl(`/biz-service/finishedInspection/info/${id}`),
+    method: 'get'
+  })
+}
+
+// 获取生产检验信息
+export function getProInspectionDetail (id) {
+  return request({
+    url: request.adornUrl(`/biz-service/productionInspection/info/${id}`),
+    method: 'get'
+  })
+}

src/views/common/msg.vue

@@ -43,7 +43,7 @@
         }
         if (json) {
           this.updateMsgCollections(json)
-          if (json.length <= 5) {
+          if (json.length <= 2) {
             json.forEach((item) => {
               this.notice(item)
             })

src/views/modules/check/fc-detail.vue

@@ -0,0 +1,77 @@
+<template>
+    <el-dialog
+      title="详情"
+      width="70%"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <div style="margin-left: 20px;margin-right: 20px">
+        <e-desc title="基本信息">
+          <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
+          <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+          <e-desc-item label="状态">{{dataForm.state?optionsStates.find(item => item.code === dataForm.state).value:''}}</e-desc-item>
+
+          <e-desc-item label="工艺名称">{{dataForm.techName}}</e-desc-item>
+          <e-desc-item label="工序号">{{dataForm.stepName}}</e-desc-item>
+
+          <e-desc-item label="记录说明" span="3">{{dataForm.recordsNote}}</e-desc-item>
+
+          <e-desc-item label="检验员">{{dataForm.operation}}</e-desc-item>
+          <e-desc-item label="检验时间">{{dataForm.operationTime}}</e-desc-item>
+
+          <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+        </e-desc>
+      </div><span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+      </span>
+
+    </el-dialog>
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import { getFinishedInspectionDetail } from '@/api/check'
+  export default {
+    name: 'fc-detail',
+    components: {
+      EDesc, EDescItem
+    },
+    data () {
+      return {
+        visible: false,
+        dataForm: {},
+        checkList: [],
+        optionsStates: [
+          {
+            code: '0', value: '等待'
+          },
+          {
+            code: '1', value: '未开始'
+          },
+          {
+            code: '2', value: '进行中'
+          },
+          {
+            code: '3', value: '已完成'
+          }
+        ]
+      }
+    },
+    methods: {
+      async init (id) {
+        console.log('id = ' + id)
+        this.visible = true
+        this.dataForm = {}
+        await getFinishedInspectionDetail(id).then(({data}) => {
+          if (data && data.code === '200' && data.data) {
+            this.dataForm = data.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -27,7 +27,7 @@
         prop="productName"
         header-align="center"
         align="center"
-        min-width="200"
+        min-width="180"
         :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
@@ -43,12 +43,16 @@
         prop="techName"
         header-align="center"
         align="center"
+        width="160"
+        :show-tooltip-when-overflow="true"
         label="工艺名称">
       </el-table-column>
       <el-table-column
         prop="stepName"
         header-align="center"
         align="center"
+        width="100"
+        :show-tooltip-when-overflow="true"
         label="工序号">
       </el-table-column>
       <el-table-column
@@ -61,6 +65,8 @@
         prop="recordsNote"
         header-align="center"
         align="center"
+        width="180"
+        :show-tooltip-when-overflow="true"
         label="记录说明">
       </el-table-column>
       <el-table-column
@@ -73,24 +79,25 @@
         prop="operationTime"
         header-align="center"
         align="center"
+        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"
         align="center"
-        width="150"
+        width="80"
         label="操作">
         <template slot-scope="scope">
-          <el-button v-if="isAuth('quality:finished:info')" type="text" size="small" @click="addOrUpdateHandle(scope.row.inspectionId, true)">查看</el-button>
+          <el-button v-if="isAuth('quality:finished:info')" type="text" size="small" @click="detailHandle(scope.row.taskId)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -103,20 +110,19 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <detail v-if="detailVisible" ref="details"/>
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './ibc-add-or-update'
+  import Detail from './fc-detail'
   import { getFinishCheckList } from '@/api/check'
   export default {
     name: 'product-check',
-    components: {AddOrUpdate},
+    components: {Detail},
     data () {
       return {
-        addOrUpdateVisible: false,
+        detailVisible: false,
         dataForm: {},
         dataList: [],
         pageIndex: 1,
@@ -176,6 +182,13 @@
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(id, disable)
         })
+      },
+      // 详情
+      detailHandle (id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.details.init(id)
+        })
       }
     }
   }

src/views/modules/check/pc-detail.vue

@@ -0,0 +1,77 @@
+<template>
+    <el-dialog
+      title="详情"
+      width="70%"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <div style="margin-left: 20px;margin-right: 20px">
+        <e-desc title="基本信息">
+          <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
+          <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+          <e-desc-item label="状态">{{dataForm.state?optionsStates.find(item => item.code === dataForm.state).value:''}}</e-desc-item>
+
+          <e-desc-item label="工艺名称">{{dataForm.techName}}</e-desc-item>
+          <e-desc-item label="工序号">{{dataForm.stepName}}</e-desc-item>
+
+          <e-desc-item label="记录说明" span="3">{{dataForm.recordsNote}}</e-desc-item>
+
+          <e-desc-item label="检验员">{{dataForm.operation}}</e-desc-item>
+          <e-desc-item label="检验时间">{{dataForm.operationTime}}</e-desc-item>
+
+          <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+        </e-desc>
+      </div><span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+      </span>
+
+    </el-dialog>
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import { getProInspectionDetail } from '@/api/check'
+  export default {
+    name: 'pc-detail',
+    components: {
+      EDesc, EDescItem
+    },
+    data () {
+      return {
+        visible: false,
+        dataForm: {},
+        checkList: [],
+        optionsStates: [
+          {
+            code: '0', value: '等待'
+          },
+          {
+            code: '1', value: '未开始'
+          },
+          {
+            code: '2', value: '进行中'
+          },
+          {
+            code: '3', value: '已完成'
+          }
+        ]
+      }
+    },
+    methods: {
+      async init (id) {
+        console.log('id = ' + id)
+        this.visible = true
+        this.dataForm = {}
+        await getProInspectionDetail(id).then(({data}) => {
+          if (data && data.code === '200' && data.data) {
+            this.dataForm = data.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -95,10 +95,10 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="150"
+        width="80"
         label="操作">
         <template slot-scope="scope">
-          <el-button v-if="isAuth('quality:production:info')" type="text" size="small" @click="addOrUpdateHandle(scope.row.inspectionId, true)">查看</el-button>
+          <el-button v-if="isAuth('quality:production:info')" type="text" size="small" @click="detailHandle(scope.row.taskId, true)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,20 +111,19 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <detail v-if="detailVisible" ref="details"/>
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './ibc-add-or-update'
+  import Detail from './pc-detail'
   import { getProductCheckList } from '@/api/check'
   export default {
     name: 'product-check',
-    components: {AddOrUpdate},
+    components: {Detail},
     data () {
       return {
-        addOrUpdateVisible: false,
+        detailVisible: false,
         dataForm: {},
         dataList: [],
         pageIndex: 1,
@@ -194,6 +193,13 @@
           return '不合格'
         }
         return ''
+      },
+      // 详情
+      detailHandle (id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.details.init(id)
+        })
       }
     }
   }

src/views/modules/order/order.vue

@@ -37,6 +37,7 @@
         header-align="center"
         align="center"
         min-width="180"
+        :show-tooltip-when-overflow="true"
         label="订单编码">
       </el-table-column>
       <el-table-column

src/views/modules/production/damage-details.vue

@@ -7,7 +7,8 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <e-desc title="基本信息" column="3">
         <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
-        <e-desc-item label="产品编号" span="2">{{dataForm.prodCode}}</e-desc-item>
+        <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+        <e-desc-item label="状态">{{formatState(dataForm)}}</e-desc-item>
 
         <e-desc-item label="订单编码">{{dataForm.orderCode}}</e-desc-item>
         <e-desc-item label="工艺名称" span="2">{{dataForm.techName}}</e-desc-item>
@@ -57,6 +58,13 @@
             this.dataForm = data.data
           }
         })
+      },
+      // 状态
+      formatState (row) {
+        if (!row.state) return ''
+        if (Number(row.state) === 1) return '未重新排产'
+        if (Number(row.state) === 2) return '已重新排产'
+        return ''
       }
     }
   }

src/views/modules/production/damage.vue

@@ -89,14 +89,14 @@
         :formatter="formatDamageType"
         label="损坏类型">
       </el-table-column>
-      <el-table-column
-        prop="liableUserName"
-        header-align="center"
-        align="center"
-        min-width="160"
-        :show-overflow-tooltip="true"
-        label="报损说明">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="liableUserName"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        min-width="160"-->
+<!--        :show-overflow-tooltip="true"-->
+<!--        label="报损说明">-->
+<!--      </el-table-column>-->
       <el-table-column
         prop="createTime"
         header-align="center"

src/views/modules/production/scheduling.vue

@@ -160,6 +160,7 @@
               type: 'success',
               message: '批量排产成功!'
             })
+            this.getDataList()
           } else {
             this.$message({
               type: 'error',

src/views/modules/tech/product-management.vue

@@ -273,7 +273,8 @@
       },
       // 转换属性“是否组合产品”
       composeFormat (row) {
-        if (row.isCompose === 1) {
+        if (!row.isCompose) return ''
+        if (Number(row.isCompose) === 1) {
           return '是'
         } else return '否'
       },

src/views/modules/works/handover-records.vue

@@ -87,6 +87,7 @@
           label="移交时间">
         </el-table-column>
         <el-table-column
+          v-if="isAuth('prod:transfer:info')"
           fixed="right"
           header-align="center"
           align="center"

src/views/modules/works/work.vue

@@ -99,7 +99,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button v-if="isAuth('work:clt:start') && (scope.row.state == 0 || scope.row.state == 1)" :disabled="scope.row.state == 0" type="text" size="small" @click="startTask(scope.row.taskId)">开始</el-button>
-          <el-button v-if="isAuth('work:clt:complete') && scope.row.state != 3" type="text" size="small" @click="transferTask(scope.row.taskId, scope.row.workTypeId)">移交</el-button>
+          <el-button v-if="isAuth('work:clt:transfer') && scope.row.state != 3" type="text" size="small" @click="transferTask(scope.row.taskId, scope.row.workTypeId)">移交</el-button>
           <el-button v-if="isAuth('work:clt:complete') && scope.row.state == 2 && (scope.row.nodeType == null || scope.row.nodeType == 'start' || scope.row.nodeType == 'produce')" type="text" size="small" @click="completeTask(scope.row.taskId)">完成</el-button>
           <el-button v-if="isAuth('work:clt:complete') && scope.row.state == 2 && (scope.row.nodeType == 'check' || scope.row.nodeType == 't-check')" type="text" size="small" @click="checkTask(scope.row.taskId, 1)">通过</el-button>
           <el-button v-if="isAuth('work:clt:complete') && scope.row.state == 2 && (scope.row.nodeType == 'check' || scope.row.nodeType == 't-check')" type="text" size="small" @click="checkTask(scope.row.taskId, 2)">不通过</el-button>