Merge branch 'feature/ljm/20230608'

src/views/OrderTrack/invoice.vue

@@ -54,12 +54,13 @@
       <div class="data-box th-all" v-if="tableData">
       <div class="data-box th-all" v-if="tableData">
         <el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
         <el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
           <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
           <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
+          <el-table-column label="发货信息">
             <el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="status_val" label="状态" min-width="80" :show-overflow-tooltip="true" align="center">
+            <el-table-column prop="status_val" label="状态" min-width="100" :show-overflow-tooltip="true" align="center">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
                 <el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
                 <el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
                 <el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
@@ -75,6 +76,23 @@
             <el-table-column prop="create_name" label="创建人" min-width="100" align="center"></el-table-column>
             <el-table-column prop="create_name" label="创建人" min-width="100" align="center"></el-table-column>
             <el-table-column prop="purchase_name" label="订单人员" min-width="100" align="center"></el-table-column>
             <el-table-column prop="purchase_name" label="订单人员" min-width="100" align="center"></el-table-column>
             <el-table-column prop="create_time" label="创建时间" width="150" align="center"></el-table-column>
             <el-table-column prop="create_time" label="创建时间" width="150" align="center"></el-table-column>
+          </el-table-column>
+          <el-table-column label="质检信息">
+            <el-table-column prop="qc_type_val" label="质检结果" width="100">
+              <template slot-scope="scope">
+                <template v-if="scope.row.qc_type_val">
+                  <span>{{ scope.row.qc_type_val }}</span>
+                  <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
+                    <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
+                    <div slot="content">{{ scope.row.qc_type_tips }}</div>
+                  </el-tooltip>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="package" label="封装" width="100" align="center"></el-table-column>
+            <el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>
+            <el-table-column prop="qc_time" label="质检时间" width="150" align="center"></el-table-column>
+          </el-table-column>
         </el-table>
         </el-table>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
       </div>
       </div>