67

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -134,13 +134,24 @@
           </div>
            <div class="fullscreen-content-select-block">
             <Button
+              @click="handleSelectionCancel"
+              size="large"
+              type="primary"
+              :ghost='selectedAll?true:false'
+              style="margin-right: 10px"
+              v-if="selectedAll"
+            >
+              取消全选
+            </Button>
+            <Button
               @click="handleSelectionAll"
               size="large"
               type="primary"
               :ghost='selectedAll?true:false'
               style="margin-right: 10px"
+              v-else
             >
-              {{selectedAll?"取消全选":'全选'}}
+              全选
             </Button>
           </div>
         </div>
@@ -376,7 +387,6 @@
       <Modal
         class="selection-rowno-modal"
         v-model="selectionRownolModal"
-       
         width="80%"
       >
       <div slot="header"><h1>行号选择</h1></div>
@@ -437,7 +447,7 @@
           >
             返回
           </Button>
-          <Button @click="handleRowNoComfirm(chooseLineNo)" type="primary"
+          <Button @click="handleRowNoComfirm" type="primary"
           style="margin-right: 10px;width:30%;height:1rem;font-size:2em">
             确认
           </Button>
@@ -672,6 +682,21 @@
           </Button>
         </div>
       </Modal>
+      <Modal v-model="selectTrue" :closable='false'>
+        <div style="text-align:center;margin:2em"><h1>是否全选所有页面的所有部件</h1></div>
+        <div slot="footer" style="text-align:center;">
+          <Button
+            @click="selectTrue=false"
+            type="primary"
+            style="margin-right: 0.5rem;width:30%;height:1rem;font-size:0.4rem"
+          >
+            返回
+          </Button>
+          <Button @click="selectOk" type="primary"  style="margin-right: 0.5rem;width:30%;height:1rem;font-size:0.4rem">
+            确认
+          </Button>
+        </div>
+      </Modal>
     </Modal>
     <div ref='printRow' class="printRow">
       <div v-for="(item,index) in tagPrintList" :key="index" class="printRow_content" style="width:400px">
@@ -698,6 +723,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      selectTrue:false,
       cancelData:[],
       tagPrintList:[],
     produceID:null,
@@ -811,7 +837,18 @@ export default {
     // })
   },
   methods: {
-    handleSelectionAll(){
+    selectOk(){
+      this.selectTrue = false;
+       this.selectedAll = !this.selectedAll;
+        this.contentData.map(v=>{
+          v.isChoosed = true
+        });
+        this.saveData = [];
+    },
+handleSelectionAll(){
+     this.selectTrue = true;
+},
+    handleSelectionCancel(){
         this.selectedAll = !this.selectedAll;
       if(this.selectedAll){
         this.contentData.map(v=>{
@@ -970,11 +1007,13 @@ export default {
       this.saveData = [];
       if (type == 2 && this.selectedInfo.order_no == "") {
         return this.$Message.warning("请先选择项目");
+        
       }
       this.currentSearchValue = "";
       this.currentSearchValue = obj.currentSearchValue;
       this.currencySelectedObj = obj;
       this.selectionModal = true;
+      this.total = 0;
       this.currencySelectedObj.type = type;
       if (this.currencySelectedObj.list.length == 0 || type == 2) {
         this.handleCurrentSearch(
@@ -984,8 +1023,7 @@ export default {
       }
     },
     handleSelectionRowno(row) {
-      console.log(`row`, row);
-      if (this.selectedInfo.rows.legth > 0) {
+      if (this.selectedInfo.rows.length > 0) {
         this.chooseLineNo = JSON.parse(JSON.stringify(this.selectedInfo.rows));
       } else {
         this.chooseLineNo = [{ start: null, end: null }];
@@ -1290,7 +1328,7 @@ export default {
         },
       }).then((res) => {
         if (res.code == 200) {
-          console.log(`res`, res);
+         
           res.data.data.map((v) => (v.isChoosed = false));
           this.contentData = res.data.data;
           if(this.selectedAll){
@@ -1462,7 +1500,13 @@ export default {
     // },
     //行号确认
     handleRowNoComfirm() {
-      this.selectedInfo.rows = JSON.parse(JSON.stringify(this.chooseLineNo));
+      let data =[];
+      this.chooseLineNo.map((v)=>{
+             if(v.start&&v.end){
+               data.push(v)
+             }
+      })
+      this.selectedInfo.rows = JSON.parse(JSON.stringify(data));
       this.selectionRownolModal = false;
       this.page_index = 1;
       this.getChipDetail();
@@ -1543,6 +1587,7 @@ export default {
         this.keyboardVal = "end";
       }
       this.keyboardObj = row;
+      
       this.show2 = true;
     },
     handleOkInput() {
@@ -2251,7 +2296,7 @@ export default {
   }
 }
 .printRow{
-  // display: none;
+  display: none;
 }
 @media print {
         .printRow{

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -334,9 +334,9 @@
     <Modal
       class="selection-rowno-modal"
       v-model="selectionRownolModal"
-      title="行号选择"
       width="80%"
     >
+    <div slot="header"><h1>行号选择</h1></div>
       <div class="selection-rowno-modal-body">
         <van-number-keyboard
           :show="show2"
@@ -350,7 +350,7 @@
           v-for="(block, index) in chooseLineNo"
           :key="index"
         >
-          <span>行号区间：</span>
+          <span style="font-size:2em;">行号区间：</span>
           <Input
             v-model="block.start"
             @on-focus="handleRowNoInput(block, 1)"
@@ -676,6 +676,7 @@ export default {
       this.currentSearchValue = obj.currentSearchValue;
       this.currencySelectedObj = obj;
       this.selectionModal = true;
+      this.total = 0;
       this.currencySelectedObj.type = type;
       if (this.currencySelectedObj.list.length == 0 || type == 2) {
         this.handleCurrentSearch(
@@ -685,8 +686,7 @@ export default {
       }
     },
     handleSelectionRowno(row) {
-      console.log(`row`, row);
-      if (this.selectedInfo.rows.legth > 0) {
+      if (this.selectedInfo.rows.length > 0) {
         this.chooseLineNo = JSON.parse(JSON.stringify(this.selectedInfo.rows));
       } else {
         this.chooseLineNo = [{ start: null, end: null }];
@@ -1268,8 +1268,15 @@ export default {
     },
     //行号确认
     handleRowNoComfirm() {
-      this.selectedInfo.rows = JSON.parse(JSON.stringify(this.chooseLineNo));
+      let data =[];
+      this.chooseLineNo.map((v)=>{
+             if(v.start&&v.end){
+               data.push(v)
+             }
+      })
+      this.selectedInfo.rows = JSON.parse(JSON.stringify(data));
       this.selectionRownolModal = false;
+      this.page_index = 1;
       this.getChipDetail();
     },
     onInput(value) {
@@ -1709,8 +1716,8 @@ export default {
 }
 .selection-rowno-modal {
   .selection-rowno-modal-body {
-    font-size: 0.5rem;
-    height: 4.5rem;
+    max-height: 7rem;
+    overflow: auto;
     .selection-rowno-modal-body-block {
       margin: 0.5rem 0;
       text-align: center;

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -16,6 +16,14 @@
       :total="total"
     >
       <div slot="titleButton">
+         <Button
+          @click="exportContent"
+          type="primary"
+        
+         
+          style="margin-right: 10px"
+          >导出</Button
+        > 
         <Button
           v-if="$route.query.type == 2"
           @click="handleOrderReturn(selects)"
@@ -323,6 +331,16 @@ export default {
   },
 
   methods: {
+    async exportContent() {
+      const res = await this.axios("/api/transport_export", {
+        params: { transport_no:this.$route.query.transport_no },
+      });
+      if (res.code == 200) {
+      
+        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`;
+        location.href = url;
+      }
+    },
       outDelivery(row){
          this.info.order_in_no = Array.isArray(row)
         ? row.join(",")

src/views/ProductionOrderList/InboundForm/details.vue

@@ -461,7 +461,9 @@ export default {
          page_size:this.inboundPageSize,
          page_index:this.inboundPageIndex,
          order_no:this.$route.query.order_no,
-         type:this.$route.query.type}}).then(res=>{
+         type:this.$route.query.type,
+         ...this.proxyObj
+         }}).then(res=>{
                this.inboundTableData = res.data.data;
               this.inboundTotal = res.data.total;
               this.inboundVal = res.data.total_num;

src/views/leadMatch/MatchList/matchCheck.vue

@@ -354,8 +354,8 @@ export default {
       matchedSheetTableColumns: [
         { title: "序号", align: "center", type: "index", resizable: true,
                         width: 100 },
-         { title: "组合名称", align: "center", key:'compose_name', resizable: true,
-                        width: 100 },
+        //  { title: "组合名称", align: "center", key:'compose_name', resizable: true,
+        //                 width: 100 },
         { title: "区域名称", align: "center", key: "region",  resizable: true,
                         width: 160 },
         { title: "房号", align: "center", key: "house_number",  resizable: true,

src/views/leadMatch/MatchList/matchPage.vue

@@ -816,7 +816,7 @@ export default {
           },
         },
         { title: "序号", align: "center", type: "index", minWidth: 60 },
-          { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
+          // { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         { title: "行号", align: "center", key: "line", minWidth: 70 },
         { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
@@ -866,7 +866,7 @@ export default {
       matchedSheetTableColumns: [
         // { title: "全选", align: "center", minWidth: 60, type: "selection" },
         { title: "序号", align: "center", type: "index", minWidth: 60 },
-         { title: "组合名称", align: "center", key:'compose_name', minWidth: 100 },
+        //  { title: "组合名称", align: "center", key:'compose_name', minWidth: 100 },
         { title: "区域名称", align: "center", key: "region", minWidth: 100 },
         { title: "房号", align: "center", key: "house_number", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },

src/views/leadMatch/weightMemo/edit.vue

@@ -119,8 +119,8 @@ export default {
       tableColumns:[
             { title: "序号", type:'index', align: "center",resizable: true,
                         width: 100 },
-                { title: "组合名称", key:'compose_name', align: "center",resizable: true,
-                        width: 100 },
+                // { title: "组合名称", key:'compose_name', align: "center",resizable: true,
+                //         width: 100 },
               { title: "部件名称", key: "part_title", align: "center",resizable: true,
                         width: 140 },
                 { title: "行号", key: "line_number", align: "center", resizable: true,