产品追溯列表，权限控制

src/views/modules/trace/order-detail.vue

@@ -96,7 +96,7 @@
             width="120"
             label="操作">
             <template slot-scope="scope">
-              <el-button type="text" size="small" @click="prodDetailHandle(scope.row.id, scope.row.prodCode)">查看记录</el-button>
+              <el-button type="text" v-if="isAuth('trace:search:prod:detail')" size="small" @click="prodDetailHandle(scope.row.id, scope.row.prodCode)">查看记录</el-button>
   <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
   <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
             </template>

src/views/modules/trace/order-list.vue

@@ -83,7 +83,7 @@
           width="120"
           label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
+            <el-button type="text" v-if="isAuth('trace:search:order:detail')" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
 <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
 <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
           </template>

src/views/modules/trace/product-detail.vue

@@ -7,7 +7,7 @@
       :visible.sync="visible"
       @close="handleClose"
     > -->
-      <div class="my-title">生产监控详情</div>
+      <div class="my-title">生产详情</div>
       <el-form
         :model="dataForm"
         :rules="dataRule"

src/views/modules/trace/product-list.vue

@@ -1,6 +1,7 @@
 <!-- 产品追溯列表 -->
 <template>
   <div class="product-list">
+    <div class="my-title" v-if="!detailsVisible">产品追溯</div>
     <template v-if="!detailsVisible">
       <el-table
         :data="dataList"
@@ -13,46 +14,29 @@
           width="50"
           align="center">
         </el-table-column>
-        <el-table-column
-          prop="prodCode"
-          header-align="center"
-          align="center"
-          min-width="100"
-          :show-tooltip-when-overflow="true"
-          label="产品编号">
-        </el-table-column>
         <el-table-column
           prop="productName"
           header-align="center"
           align="center"
-          min-width="160"
+          min-width="140"
           :show-tooltip-when-overflow="true"
           label="产品名称">
         </el-table-column>
         <el-table-column
-          prop="progressBar"
+          prop="prodCode"
           header-align="center"
           align="center"
           min-width="100"
-          label="生产进度">
-          <template slot-scope="scope">
-            <el-progress :percentage="scope.row.progressBar?Number(scope.row.progressBar):0"></el-progress>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="contactDate"
-          header-align="center"
-          align="center"
-          min-width="160"
-          label="交期时间">
+          :show-tooltip-when-overflow="true"
+          label="产品编号">
         </el-table-column>
         <el-table-column
           prop="orderCode"
           header-align="center"
           align="center"
-          min-width="120"
+          min-width="140"
           :show-tooltip-when-overflow="true"
-          label="订单编码">
+          label="订单编号">
         </el-table-column>
         <el-table-column
           prop="customerName"
@@ -62,6 +46,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"
@@ -69,7 +62,7 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('prod:monitoring:info')" type="text" size="small" @click="detail(scope.row.id, scope.row.prodCode, true)">查看</el-button>
+            <el-button v-if="isAuth('trace:search:prod:detail')" type="text" size="small" @click="detail(scope.row.id, scope.row.prodCode, true)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -82,9 +75,12 @@
         :total="totalPage"
         layout="total, sizes, prev, pager, next, jumper">
       </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="onChose">返回</el-button>
+      </span>
     </template>
     <!-- 弹窗, 查看 -->
-    <detail v-if="detailsVisible" ref="details" @close="closeDialogEvent" @refreshDataList="getDataList" @onChose="onChose"/>
+    <detail v-if="detailsVisible" ref="details" @onChose="onChildClose"/>
   </div>
 </template>
 
@@ -114,7 +110,7 @@
       return {
         detailsVisible: false,
         dataForm: {},
-        dataList: [],
+        dataList: this.defaultList,
         pageIndex: 1,
         pageSize: 10,
         totalPage: Number(this.defaultTotalPage),
@@ -141,6 +137,9 @@
     },
     methods: {
       onChose () {
+        this.$emit('onChose')
+      },
+      onChildClose () {
         this.detailsVisible = false
       },
       // 查询