123

dist/static/css/chunk-034f76bc.72535064.css

@@ -0,0 +1 @@
+.header[data-v-937205ee]{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #356070}.bdy[data-v-937205ee]{height:calc(100% - 5rem);display:flex;flex-wrap:wrap;overflow:auto}.bdy[data-v-937205ee]::-webkit-scrollbar{width:8px}.bdy[data-v-937205ee]::-webkit-scrollbar-track{background:linear-gradient(180deg,#f5f5f5,#002359)}.bdy[data-v-937205ee]::-webkit-scrollbar-thumb{background:linear-gradient(180deg,#a1a1a1,#3b4169);border-radius:5px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.choose_item[data-v-937205ee]{border-radius:20px;background:#fff;color:#000}.choose_item[data-v-937205ee],.item[data-v-937205ee]{cursor:pointer;display:flex;align-items:center;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:80px}.item[data-v-937205ee]{border:1px solid #797878;color:#797878;border-radius:20px}

dist/static/css/chunk-293d97dd.fc122921.css

@@ -1 +0,0 @@
-.view[data-v-6d9ecaa9]{height:100%;padding:0;overflow-x:hidden}.form[data-v-6d9ecaa9]{box-sizing:border-box;width:100%;height:100%;color:#fff;position:absolute;top:8.8rem;padding:1.7rem 1.5rem;font-size:18px!important;font-weight:700}.logo[data-v-6d9ecaa9]{width:6rem;height:6rem;position:absolute;top:20%;left:50%;transform:translate(-50%,-70%)}.logo img[data-v-6d9ecaa9]{width:100%;height:100%}.header[data-v-6d9ecaa9]{color:#fff;font-size:1.5rem;position:relative;width:100%;top:3rem;left:1rem}[data-v-6d9ecaa9]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588235295)}[data-v-6d9ecaa9] .inp{background:#2a4470!important;border:none;color:#fff}input[data-v-6d9ecaa9]{color:#fff}.inp[data-v-6d9ecaa9]:focus{background-color:#04ffd5;color:#fff;border:1px solid #76cfff}[data-v-6d9ecaa9] .col-2,[data-v-6d9ecaa9] .col-3{color:#fff;font-family:PingFangSC-Medium,sans-serif;text-shadow:1px 1px 1px #4fc9f2;letter-spacing:2px}.btn_login[data-v-6d9ecaa9]{background:url(../../static/img/btn_login.a8f1c793.png);display:flex;height:3.5rem;justify-content:center;align-items:center;background-repeat:no-repeat;background-size:cover}

dist/static/css/chunk-5b16a57e.710a3e93.css

@@ -1 +0,0 @@
-.choose2[data-v-ba69fbba]{color:#03fcd3;position:relative}.bc[data-v-ba69fbba]{height:100%}.tabBar[data-v-ba69fbba]{width:100%;color:#a8a2a2}.footer[data-v-ba69fbba]{position:absolute;bottom:0;width:100%;height:3.06rem;z-index:1;background-image:url(../../static/img/tabbarlist.0ccaf302.png)}.nav-link[data-v-ba69fbba]{color:#abdfff}.h5[data-v-ba69fbba]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-ba69fbba]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose[data-v-ba69fbba]{color:#03fcd3}.circle[data-v-ba69fbba]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-ba69fbba],.choose_3[data-v-ba69fbba]{border-radius:50%;background:#03fcd3;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-ba69fbba] .ivu-modal{top:42%;width:8rem!important;left:50%;transform:translate(-50%,-50%);margin:0}[data-v-ba69fbba] .ivu-modal-content{background-color:rgba(0,0,0,.6)!important}[data-v-ba69fbba] .ivu-modal-body{padding:0}[data-v-ba69fbba] .ivu-btn-primary{background-color:#0f4680}

dist/static/css/chunk-752cd159.dc2d4f50.css

@@ -0,0 +1 @@
+.choose2[data-v-0533bc29]{color:#03fcd3;position:relative}.bc[data-v-0533bc29]{height:100%}.tabBar[data-v-0533bc29]{width:100%;color:#a8a2a2}.footer[data-v-0533bc29]{position:absolute;bottom:0;width:100%;height:3.06rem;z-index:1;background-image:url(../../static/img/tabbarlist.0ccaf302.png)}.nav-link[data-v-0533bc29]{color:#abdfff}.h5[data-v-0533bc29]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-0533bc29]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose[data-v-0533bc29]{color:#03fcd3}.circle[data-v-0533bc29]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-0533bc29],.choose_3[data-v-0533bc29]{border-radius:50%;background:#03fcd3;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-0533bc29] .ivu-modal{top:42%;width:8rem!important;left:50%;transform:translate(-50%,-50%);margin:0}[data-v-0533bc29] .ivu-modal-content{background-color:rgba(0,0,0,.6)!important}[data-v-0533bc29] .ivu-modal-body{padding:0}[data-v-0533bc29] .ivu-btn-primary{background-color:#0f4680}

dist/static/css/chunk-77a696ae.85720bcd.css

@@ -0,0 +1 @@
+.view[data-v-635a7734]{height:100%;padding:0;overflow-x:hidden}.form[data-v-635a7734]{box-sizing:border-box;width:100%;height:100%;color:#fff;position:absolute;top:8.8rem;padding:1.7rem 1.5rem;font-size:18px!important;font-weight:700}.logo[data-v-635a7734]{width:6rem;height:6rem;position:absolute;top:20%;left:50%;transform:translate(-50%,-70%)}.logo img[data-v-635a7734]{width:100%;height:100%}.header[data-v-635a7734]{color:#fff;font-size:1.5rem;position:relative;width:100%;top:3rem;left:1rem}[data-v-635a7734]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588235295)}[data-v-635a7734] .inp{background:#2a4470!important;border:none;color:#fff}input[data-v-635a7734]{color:#fff}.inp[data-v-635a7734]:focus{background-color:#04ffd5;color:#fff;border:1px solid #76cfff}[data-v-635a7734] .col-2,[data-v-635a7734] .col-3{color:#fff;font-family:PingFangSC-Medium,sans-serif;text-shadow:1px 1px 1px #4fc9f2;letter-spacing:2px}.btn_login[data-v-635a7734]{background:url(../../static/img/btn_login.a8f1c793.png);display:flex;height:3.5rem;justify-content:center;align-items:center;background-repeat:no-repeat;background-size:cover}

dist/static/css/chunk-e5911432.cd72123a.css

@@ -1 +0,0 @@
-.header[data-v-1887477a]{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #356070}.bdy[data-v-1887477a]{height:calc(100% - 5rem);display:flex;flex-wrap:wrap;overflow:auto}.bdy[data-v-1887477a]::-webkit-scrollbar{width:8px}.bdy[data-v-1887477a]::-webkit-scrollbar-track{background:linear-gradient(180deg,#f5f5f5,#002359)}.bdy[data-v-1887477a]::-webkit-scrollbar-thumb{background:linear-gradient(180deg,#a1a1a1,#3b4169);border-radius:5px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.choose_item[data-v-1887477a]{border-radius:20px;background:#fff;color:#000}.choose_item[data-v-1887477a],.item[data-v-1887477a]{cursor:pointer;display:flex;align-items:center;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:80px}.item[data-v-1887477a]{border:1px solid #797878;color:#797878;border-radius:20px}

src/views/Login.vue

@@ -86,6 +86,8 @@ export default {
         if (res.code === 200) {
           if (res.data.status === 'error') {
             return this.$Message.error(res.data.errorMessage)
+          } else if (res.data.userDto.roleNames.indexOf('ROLE_HARDWARE') === -1) {
+            return this.$Message.error('用户无权访问！')
           } else {
             this.$Message.success(res.msg)
             localStorage.setItem('site', JSON.stringify({ site: this.form.site, site_show: this.form.site_show }))

src/views/cms.vue

@@ -91,8 +91,11 @@ export default {
       if (url.indexOf(this.$route.path) !== -1) {
         this.qrState = !this.qrState;
         if (this.qrState) {
+          this.target = []
+          localStorage.removeItem('fyy_target')
           androidJs.startInventory();
         } else {
+          localStorage.removeItem('fyy_target')
           androidJs.stopInventory();
           this.is_show = false;
           localStorage.setItem('fyy_target', JSON.stringify(this.target))

src/views/page/Dispatch/detail.vue

@@ -174,9 +174,7 @@ export default {
       url: `http://121.36.142.167:7774/jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/${id}`
       // post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"dispatch_orders.dispatch_no","option":"LIKE_ANYWHERE","values":[v]},{"field":"product_no","option":"LIKE_ANYWHERE","values":["BC030101000001"]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"dispatch_orders","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true},
     }
-    // console.log(data);
     this.initData(data)
-    // console.log(data);
   },
   methods: {
     // 原始数据获取
@@ -244,12 +242,13 @@ export default {
       return key;
     },
     deelUniqueProductKey(element) {
-      let key = element.order_no+'_'+element.product_code
+      let key = element.product_code + (element.color?element.color:'') + (element.color_two?element.color_two:'') +(element.process_title?element.process_title:'') +(element.process_title_two?element.process_title_two:'')
       return key;
     },
     // 将原始数据处理拼接成提交的数据
     deelTableData() {
       let new_table_data = [];
+      let is_scan_key = {};
       console.log(this.scan_data);
       this.scan_data.forEach((element, index) => {
         if (this.is_box_data.indexOf(element.box_no) === -1 && Object.keys(this.key_tableData).indexOf(this.deelUniqueProductKey(element)) !== -1 && (this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty - element.box_num) >= 0) {
@@ -258,6 +257,7 @@ export default {
           table_data_detail.box_orders_show = element.box_no;
           table_data_detail.out_qty += element.box_num;
         this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty -= element.box_num*1;
+          is_scan_key[this.deelUniqueProductKey(element)]=1;
           // table_data_detail.this_delivery_qty =  this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty;
           table_data_detail.id = null;
 
@@ -265,7 +265,10 @@ export default {
         }
       })
       this.tableData.forEach((element, index) => {
-        if (element.this_delivery_qty > 0) {
+        // if (element.this_delivery_qty > 0 && element.out_qty === 0) {
+        //   new_table_data.push(element)
+        // }
+        if(!is_scan_key[this.deelUniqueProductKey(element)]){
           new_table_data.push(element)
         }
       })
@@ -387,7 +390,7 @@ export default {
 }
 
 .send_work {
-  height: 9.69rem;
+  height: 10.69rem;
   background-image: url('../../../assets/home/packUpback.png');
   background-size: 100% 100%;
   margin-top: 1.38rem;

src/views/page/Finish/detail.vue

@@ -118,15 +118,15 @@ export default {
     let text = []
     if (localStorage.getItem('fyy_target')) {
       let target = JSON.parse(localStorage.getItem('fyy_target'))
-      localStorage.removeItem('fyy_target')
+      // this.$Message.warning({ content: localStorage.getItem('fyy_target'), duration: 10 })
+      // localStorage.removeItem('fyy_target')
       target.forEach(v => {
         v = v.replace(/\"/g, '')
         text.push(this.func.hexToString(v))
       })
     }
     this.tableData = []
-    // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
-    text = ['PG2023082800039']
+    // // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
     text.forEach(v => {
       const data = {
         url: 'http://121.36.142.167:7774/jbl/api/module-data/dispatch_orders/page',
@@ -150,14 +150,14 @@ export default {
       if (this.tableData.filter(v => v.is_choose).length === 0) {
         return this.$Message.warning('请先选择数据！')
       }
-      localStorage.removeItem('fyy_target')
+      // localStorage.removeItem('fyy_target')
       const dataId = Math.floor(Math.random() * 100)
       const text = JSON.stringify(this.tableData.filter(v => v.is_choose))
       localStorage.setItem(dataId + '', text)
       this.$router.push({ path: '/cms/finish/detailed', query: { id: dataId } })
     },
     handleReturn() {
-      localStorage.removeItem('fyy_target')
+      // localStorage.removeItem('fyy_target')
       this.$router.push('/cms/home')
     },
     handleChoose(item, index) {

src/views/page/Finish/detailed.vue

@@ -31,7 +31,7 @@
               <div class="secd_input">
                 <div class="secd_input_l">人员：</div>
                 <div class="secd_input_r">
-                  <Select id="input-3" multiple v-model="item.employee_id" class="inp select_list"
+                  <Select id="input-3" multiple v-model="item.employee_id"
                     required @on-change="handleChangeEmployee($event, index)">
                     <Option v-for="item in employeeList" :key="item.value" :label="item.text" :value="item.value"/>
                   </Select>
@@ -774,4 +774,7 @@ export default {
   margin: 0.5rem;
   border: 0.1rem solid;
 }
+/deep/.ivu-select-selection{
+  background-color: transparent;
+}
 </style>

src/views/page/Package/detailed.vue

@@ -38,11 +38,24 @@
                     @on-change="handleChangeEmployee($event, index)"></b-form-select>
                 </div>
               </div>
-              <div class="secd_input">
+              <div class="secd_input" v-for='(_item,_index) in item.box_orders_label_product' :key="_index" style="flex-direction: column;">
+                <div style="display: flex">
+                <div class="secd_input_l">商标名称：</div>
+                <div class="secd_input_r">
+                  <span>{{_item.product_title}}</span>
+                </div>
+              </div>
+                <div style="display: flex;margin-top: .5rem">
                 <div class="secd_input_l">商标损耗：</div>
                 <div class="secd_input_r">
-                  <b-form-select id="input-3" v-model="item.num" :options="numList" class="inp select_list" required
-                    placeholder="请选择设备" @change="(e) => handleChangeEquipment(e, index)"></b-form-select>
+                  <input style="height: 2.2rem" type="text" v-model="_item.loss_num" placeholder="请输入数量">
+                </div>
+              </div>
+                <div style="display: flex;margin-top: .5rem">
+                  <div class="secd_input_l">商标备注：</div>
+                  <div class="secd_input_r">
+                    <input style="height: 2.2rem" type="text" v-model="_item.remark" placeholder="请输入备注">
+                  </div>
                 </div>
               </div>
             </div>
@@ -186,8 +199,30 @@ export default {
     initData(id) {
       if (id) {
         this.list = JSON.parse(localStorage.getItem(id + ''))
+        let box_orders_label_product = [];
+            {
+          order_no:
+          order_item_no:
+        order_item_id:""
+      }
         this.list.forEach(v => {
-          v.team_id = ''
+          v.team_id = '';
+          v.box_orders_label_product = [];
+          v.prod_trademark_compare_c.brand_code.split(',').forEach((c, idx) => {
+            let obj = {}
+            obj.order_no = v.exe_sale_order_b.no
+            obj.order_item_no = v.item_no
+            obj.order_item_id = v.id
+            obj.loss_num = ''
+            obj.product_no = c
+            obj.product_title = v.prod_trademark_compare_c.brand_code_show.split('$$$')[idx]
+            obj.product_size = v.specs
+            obj.product_unit = v.unit_code
+            obj.product_unit_title = v.unit_code_show
+            obj.remark = ''
+            obj.site = null
+            v.box_orders_label_product.push(obj)
+          })
         })
       }
 
@@ -210,11 +245,13 @@ export default {
     },
     handleSure() {
       let box_orders_products = [];
+      let box_orders_label_products = []
       let team_id = '';
       // let team_name = '';
       // let employee_ids = '';
       // let employee_names = '';
       this.list.forEach((v, index) => {
+        box_orders_label_products.push(...v.box_orders_label_product)
         let box_orders_product = {
           "item_num": (index + 1),
           "product_no": v.material_code,
@@ -265,7 +302,7 @@ export default {
         "showModelId": "474108545251880960",
         data: {
           "box_orders": box_orders,
-          "box_orders_label_product": [],
+          "box_orders_label_product": box_orders_label_products,
           "box_orders_product": box_orders_products,
           "production_orders_dtl": box_orders_products,
         }
@@ -512,6 +549,7 @@ export default {
 }
 
 .send_work {
+  height:24rem;
   background-image: url('../../../assets/home/packUpback.png');
   background-size: 100% 100%;
   margin-top: 1.38rem;

src/views/page/print.vue

@@ -7,8 +7,8 @@
     <div class="bdy">
      <div v-for="(item,index) in list" :key="index" :class="item.is_choose?'choose_item':'item'" @click="handleClick(index)">
        <div style="margin-bottom:10px">
-         <span>派工单号：</span>
-         <span>{{item.dispatch_no}}</span>
+         <span>{{item.dispatch_no?'派工单号:':'包装单号:'}}</span>
+         <span>{{item.dispatch_no?item.dispatch_no:item.box_no}}</span>
        </div>
 <!--       <div>-->
 <!--         <span>派工单号：</span>-->
@@ -35,7 +35,8 @@ export default {
       // text.pop()
       this.list = JSON.parse(text)
       // eslint-disable-next-line no-return-assign
-      this.list.forEach(v => v.is_choose = false)
+      this.list.forEach(v => v.is_choose = true)
+      this.selectData = JSON.parse(JSON.stringify(this.list))
     }
   },
   methods: {
@@ -50,12 +51,14 @@ export default {
       }
       let arr = [{ PTK_OpenUSBPort: 255 }, { PTK_ClearBuffer: "" }, { PTK_SetDarkness: 10 }, { PTK_SetPrintSpeed: 4 }, { PTK_SetDirection: "B" }, { PTK_SetLabelHeight: "204,24,0,false" }, { PTK_SetLabelWidth: 800 }]
       this.selectData.forEach(v => {
-        let cont = (this.func.stringToHex(v.dispatch_no).length)%4;
-        v.chip = this.func.stringToHex(v.dispatch_no)
+        v.order_no = v.dispatch_no ? v.dispatch_no : v.box_no
+        v.is_s = v.dispatch_no ? true :false
+        let cont = (this.func.stringToHex(v.order_no).length)%4;
+        v.chip = this.func.stringToHex(v.order_no)
         for(let i = 0;i<cont;i++){
           v.chip = '0'+ v.chip
         }
-        let obj = [{ PTK_DrawText_TrueType: "0,25,45,0,微软雅黑,1,700,0,0,0,派工单号：" }, { PTK_DrawText_TrueType: "150,25,45,0,微软雅黑,1,700,0,0,0,"+v.dispatch_no }, { PTK_RWRFIDLabel: `1,0,0,${v.chip.length / 2},1,${v.chip}` }, { PTK_PrintLabel: "1,1" }]
+        let obj = [{ PTK_DrawText_TrueType: `0,25,45,0,微软雅黑,1,700,0,0,0,${v.is_s ? '派工单号:' : '包装单号:'}` }, { PTK_DrawText_TrueType: `150,25,45,0,微软雅黑,1,700,0,0,0,${v.dispatch_no ? v.dispatch_no:v.box_no}` }, { PTK_RWRFIDLabel: `1,0,0,${v.chip.length / 2},1,${v.chip}` }, { PTK_PrintLabel: "1,1" }]
         arr.push(...obj)
       })
       arr.push({ PTK_CloseUSBPort: "" })