chris 1 vuosi sitten
vanhempi
commit
8c8288cd86

+ 5 - 4
src/views/modules/order/dispatch.vue

@@ -56,21 +56,22 @@
           label="客户名称">
         </el-table-column>
         <el-table-column
+          fixed="right"
           prop="contractNumber"
           header-align="center"
           align="center"
           min-width="160"
           :show-tooltip-when-overflow="true"
-          label="合同号">
+          label="生产编号">
         </el-table-column>
         <el-table-column
-          prop=""
+          fixed="right"
           header-align="center"
           align="center"
           min-width="80"
           :formatter="stateFormat"
           :show-tooltip-when-overflow="true"
-          label="生产编号">
+          label="生产状态">
         </el-table-column>
         <el-table-column
           prop="productName"
@@ -148,7 +149,7 @@
             <el-button :disabled="!scope.row.attachList || scope.row.attachList.length === 0" type="text" size="small" @click="attachDetails(scope.row)">查看</el-button>
           </template>
         </el-table-column>
-        
+
         <el-table-column
           fixed="right"
           header-align="center"

+ 17 - 2
src/views/modules/quality/disqualification.vue

@@ -1,7 +1,7 @@
 <!-- 不合格品审理单 -->
 <template>
   <div>
-    <template v-if="!updateVisible && !disposeVisible && !verifyVisible">
+    <template v-if="!updateVisible && !disposeVisible && !verifyVisible && !this.detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
         <el-form-item label="物料名称">
           <el-input
@@ -320,6 +320,7 @@
           label="操作"
         >
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click="detailHandle(scope.row.invoicesId)">详情</el-button>
             <el-button
               v-if="isAuth('disqualification:invoices:update') && Number(scope.row.state) === 1"
               type="text"
@@ -358,6 +359,7 @@
     <quality-disqualification-update ref="update" v-if="updateVisible" @onChose="onChose" />
     <quality-disqualification-dispose ref="dispose" v-if="disposeVisible" @onChose="onChose" />
     <quality-disqualification-verify ref="verify" v-if="verifyVisible" @onChose="onChose" />
+    <disqualification-detail ref="detail" v-if="detailVisible"  @onChose="onChose" />
   </div>
 </template>
 
@@ -367,14 +369,20 @@ import QualityDisqualificationUpdate from './disqualification-update'
 import QualityDisqualificationDispose from './disqualification-dispose'
 import QualityDisqualificationVerify from './disqualification-verify'
 import {approveStateOption, measureStateOption} from '@/utils/enums'
+import DisqualificationDetail from '@/views/modules/quality/disqualification-detail'
 export default {
   name: 'quality-disqualification',
-  components: {QualityDisqualificationUpdate, QualityDisqualificationDispose, QualityDisqualificationVerify},
+  components: {
+    DisqualificationDetail,
+    QualityDisqualificationUpdate,
+    QualityDisqualificationDispose,
+    QualityDisqualificationVerify},
   data () {
     return {
       updateVisible: false,
       disposeVisible: false,
       verifyVisible: false,
+      detailVisible: false,
       approveStateOption: approveStateOption,
       measureStateOption: measureStateOption,
       dataForm: {},
@@ -394,6 +402,7 @@ export default {
       this.updateVisible = false
       this.disposeVisible = false
       this.verifyVisible = false
+      this.detailVisible = false
     },
     search () {
       this.pageIndex = 1
@@ -456,6 +465,12 @@ export default {
       this.$nextTick(() => {
         this.$refs.verify.init(item.invoicesId)
       })
+    },
+    detailHandle (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.detail.init(id)
+      })
     }
   }
 }

+ 2 - 2
src/views/modules/quality/first.vue

@@ -223,8 +223,8 @@
       </el-pagination>
     </template>
     <quality-first-update ref="update" v-if="updateVisible" @onChose="onChose" />
-    <attach-detail-dialog ref="attachDetail" v-if="attachVisible" />
-    <first-detail ref="detail" v-if="detailVisible"/>
+    <attach-detail-dialog ref="attachDetail" v-if="attachVisible" @onChose="onChose" />
+    <first-detail ref="detail" v-if="detailVisible" @onChose="onChose" />
   </div>
 </template>