Merge branch 'lx-test' of gitee.com:cabbage_qd/web-base-admin into lx-online

src/components/Delivery/nowdelivery.vue

@@ -99,8 +99,6 @@
         />
         <el-table-column align="center" prop="unitName" :label="'产品单位'" />
         <el-table-column align="center" prop="quantity" :label="'产品数量'" />
-        <el-table-column align="center" prop="isBarCodeVal" label="是否追溯" />
-        <el-table-column align="center" prop="barCode" :label="'追溯编号'" />
         <el-table-column align="center" prop="recName" :label="'收货人'" />
         <el-table-column
           min-width="120px"
@@ -251,7 +249,6 @@
             :label="'产品数量'"
           />
 
-          <el-table-column align="center" prop="barCode" :label="'追溯编号'" />
           <el-table-column
             align="center"
             prop="orderCode"

src/components/Delivery/yihandeled.vue

@@ -10,7 +10,7 @@
             :disabled="multiple"
             @click="getPrintCheck"
           >{{ '生成打印' }}</el-button>
-          <el-button
+          <!-- <el-button
             v-hasButtons="['DeliveryHandledBind']"
             size="small"
             class="thebtn3"
@@ -23,7 +23,7 @@
             class="thebtn3"
             :disabled="multiple"
             @click="codeBind(false)"
-          >{{ '解绑追溯' }}</el-button>
+          >{{ '解绑追溯' }}</el-button> -->
           <el-button
             v-hasButtons="['DeliveryHandledDelete']"
             size="small"
@@ -141,8 +141,6 @@
         <el-table-column align="center" prop="unitName" :label="'产品单位'" />
 
         <el-table-column align="center" prop="quantity" :label="'产品数量'" />
-        <el-table-column align="center" prop="isBarCodeVal" label="是否追溯" />
-        <el-table-column align="center" prop="barCode" :label="'追溯编号'" />
         <el-table-column align="center" prop="scanTime" :label="'扫码日期'" />
 
         <el-table-column align="center" prop="recName" :label="'收货人'" />