Merge branch 'js_dev' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into js_dev

# Conflicts:
#	src/views/base/craftManagement/route/index.vue
#	src/views/plan/order/index.vue

src/views/base/craftManagement/route/index.vue

@@ -19,16 +19,16 @@
         <el-tag v-if="row.usable == '1'" type="success">已绑定</el-tag>
         <el-tag v-else type="info">未绑定</el-tag>
       </template>
-<!--      <template #menu-left="{ size }">
-        <el-button
+      <template #menu-left="{ size }">
+<!--        <el-button
           :disabled="toDeleteIds.length < 1"
           type="refresh"
           icon="el-icon-refresh"
           :size="size"
           @click="apsSync"
           >APS同步</el-button
-        >
-      </template>-->
+        >-->
+      </template>
       <!-- :disabled="row.usable == '1' ? false : true" -->
       <template #menu-right="{}">
         <el-dropdown split-button

src/views/plan/order/index.vue

@@ -18,11 +18,10 @@
       @row-update="rowUpdate"
       @row-del="rowDel"
     >
-      <template #menu-left="{ size }">
-        <el-button type="primary"  icon="el-icon-plus" @click="handleAdd">新增</el-button>
+<!--      <template #menu-left="{ size }">
         <el-button type="primary" @click="scan">扫码导入</el-button>
         <el-button type="primary" @click="test">测试数据</el-button>
-      </template>
+      </template>-->
       <template #menu-right="{}">
         <el-dropdown v-hasPerm="['plan:order:import']" split-button
           >导入
@@ -81,13 +80,13 @@
           <i-ep-delete />
           删除
         </el-button>
-        <el-button
+<!--        <el-button
           v-if="row.orderState == '5'"
           size="small"
           type="primary"
           @click="handleScanCode(row.id)"
           >二维码生成
-        </el-button>
+        </el-button>-->
         <el-button
           icon="el-icon-notebook"
           text
@@ -351,7 +350,6 @@ option.value = {
   searchIndex: 3,
   searchIcon: true,
   editBtn: false,
-  addBtn: false,
   delBtn: false,
   searchMenuSpan: 8,
   labelWidth: 100,

src/views/plan/workOrder/components/work-order-seq.vue

@@ -88,17 +88,18 @@
             ></vue-qrcode>
 
             <div>
+              <el-text>流转卡号:</el-text>
               <el-text>{{ item.seqNo }}</el-text>
             </div>
             <div>
-              <el-text>工单号:</el-text
-              ><el-text>{{ info.workOrderCode }}</el-text>
+              <el-text>工单号:</el-text>
+              <el-text>{{ info.workOrderCode }}</el-text>
             </div>
             <div>
-              <el-text>订单编号:</el-text
-              ><el-text>{{ info.orderCode }}</el-text>
+              <el-text>订单编号:</el-text>
+              <el-text>{{ info.orderCode }}</el-text>
             </div>
-            <div>
+<!--            <div>
               <el-text>物料号:</el-text
               ><el-text>{{ info.materialCode }}</el-text>
             </div>
@@ -109,7 +110,7 @@
             <div>
               <el-text>物料型号:</el-text
               ><el-text>{{ info.materialModel }}</el-text>
-            </div>
+            </div>-->
           </div>
         </div>
       </div>
@@ -119,22 +120,22 @@
             <div class="printItem">
               <div class="leftItem">
                 <div>
-                  <div class="lable">二维码:</div>
-                  <div class="value">{{ item.seqNo }}</div>
+                  <div class="lable" style="font-size: 14px;">流转卡号:</div>
+                  <div class="value" style="font-size: 14px;">{{ item.seqNo }}</div>
                 </div>
                 <div>
-                  <div class="lable">工单号:</div>
-                  <div class="value">{{ info.workOrderCode }}</div>
+                  <div class="lable" style="font-size: 14px;">工单号:</div>
+                  <div class="value" style="font-size: 14px;">{{ info.workOrderCode }}</div>
                 </div>
                 <div>
-                  <div class="lable">订单编号:</div>
-                  <div class="value">{{ info.orderCode }}</div>
+                  <div class="lable" style="font-size: 14px;">订单编号:</div>
+                  <div class="value" style="font-size: 14px;">{{ info.orderCode }}</div>
                 </div>
-                <div>
+<!--                <div>
                   <div class="lable">物料号:</div>
                   <div class="value">{{ info.materialCode }}</div>
-                </div>
-                <div>
+                </div>-->
+<!--                <div>
                   <div class="lable">物料名称:</div>
 
                   <template v-if="info.materialName.length > 23">
@@ -149,8 +150,8 @@
                       }}
                     </div>
                   </template>
-                </div>
-                <div>
+                </div>-->
+<!--                <div>
                   <div class="lable">物料型号:</div>
 
                   <template v-if="info.materialModel.length > 23">
@@ -165,7 +166,7 @@
                       }}
                     </div>
                   </template>
-                </div>
+                </div>-->
               </div>
 
               <div class="rightItem">
@@ -182,7 +183,7 @@
       </div>
       <div class="dialog-footer" align="center">
         <el-button @click="dialog.visible = false">取消</el-button>
-        <el-button type="primary" v-print="'#printScreen'">打印</el-button>
+        <el-button type="primry" v-print="'#printScreen'">打印</el-button>
       </div>
     </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />

src/views/quality/unqualified/index.vue

@@ -25,13 +25,13 @@
                    text
                    type="primary"
         >查看</el-button>
-          <el-button
+<!--          <el-button
                   v-if="row.currentState==='5'"
                   size="small"
                   type="primary"
                   @click="handleScanCode(row.id)"
           >二维码生成
-          </el-button>
+          </el-button>-->
       </template>
 
 

src/views/storage/storage/index.vue

@@ -17,14 +17,14 @@
       @selection-change="selectionChange1"
     >
       <template #menu-left="{ size }">
-        <el-button
+<!--        <el-button
           :disabled="toDeleteIds.length < 1"
           type="primary"
           icon="el-icon-view"
           :size="size"
           @click="printCode"
           >打 印</el-button
-        >
+        >-->
       </template>
     </avue-crud>
     <el-dialog