出入库修改及二维码展示

src/views/assets/todoList.vue

@@ -237,7 +237,13 @@ export default {
             } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
                 this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
                 return;
-            } else {
+            } else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+                row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+                row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+                    this.$router.push(`/major/production/in?openDialog=${true}`)
+                return;
+          }
+            else {
                 // 根据节点预设需要激活的tab页面
                 let activeTabName = 'baseInfo';
                 if (row.currentNodeCode === 'DEPARTMENT_ALLOCATION') {

src/views/complex/index.vue

@@ -993,9 +993,15 @@ export default {
       } else {
         this.$router.push(`/major/todo/detail?id=${row.businessId}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
       }
+      if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+          this.$router.push(`/major/production/in?openDialog=${true}`)
+      }
     },
     personalToDo(row) {
       const nodeCode = row.nodeCode;
+     
       if (nodeCode === 'REPORT_OUT_APPLY' || nodeCode === 'LETTER_OUT_APPLY') {
         this.$router.push(`/personal/my/order?todoBusinessId=${row.businessId}&orderId=${row.orderId}&tId=${row.taskId}&cId=${row.currentNodeId}`)
       }
@@ -1005,7 +1011,11 @@ export default {
       else if (row.nodeCode === 'BUSINESS_ARCHIVING') {
         this.$router.push(`/personal/toSaveFile`)
         return;
-      }
+      }else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+            this.$router.push(`/major/production/in?openDialog=${true}`)
+          }
       else {
         this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&back=${'/personal/todo/list'}`)
       }
@@ -1031,7 +1041,12 @@ export default {
       } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
         this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
         return;
-      } else {
+      } else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+            this.$router.push(`/major/production/in?openDialog=${true}`)
+          }
+      else {
         // 根据节点预设需要激活的tab页面
         let activeTabName = 'baseInfo';
         if (row.currentNodeCode === 'DEPARTMENT_ALLOCATION') {

src/views/finance/fundClaim.vue

@@ -848,7 +848,8 @@ export default {
         descs: 'id',
         keyword: null,
         startDate: null,
-        endDate: null
+        endDate: null,
+        notFinished:true
       },
       myPersonalOrderDialog: false,
       myAssetsOrderDialog: false,
@@ -982,6 +983,7 @@ export default {
       this.getList()
     },
     getList() {
+      this.listQuery.notFinished = true;
       this.$api.financeRealFund.list(Object.assign({}, this.listQuery)).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;

src/views/major/detail.vue

@@ -1011,10 +1011,9 @@
                       </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item prop="validateCode" label-width="140px" class="postInfo-container-item" label="打印二维码：">
+                        <a @mouseenter="showQrCode(props.row.qrCode)">出入库二维码</a> <a @mouseenter="showQrCode(props.row.validateCode)" style="margin-left: 5px">验证二维码</a>
                         <div class="qr-code-div">
-                          <img id="validateCode" class="qr-code"  @click="printQR(props.row.validateCode)"
-                          :src="props.row.qrCode" 
-                          alt="没有产品" />
+                          <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="没有产品" @click="printQR()"/>
                         </div>
                       </el-form-item>
                     </el-col>
@@ -2595,6 +2594,7 @@
         },
         doUpload:false,
         productionFinance: [],
+        qrCodeUrl:null
       }
     },
     created() {
@@ -3282,14 +3282,18 @@
           }
         })
       },
-      printQR(path){
-      if (path){
-        let routeUrl = this.$router.resolve({
-          path: `/print/code?path=${path}`
-        });
-        window.open(routeUrl.href, '_blank');
-      }
-    }
+      printQR(){
+        let path = this.qrCodeUrl;
+        if (path){
+          let routeUrl = this.$router.resolve({
+            path: `/print/code?path=${path}`
+          });
+          window.open(routeUrl.href, '_blank');
+        }
+      },
+      showQrCode(url){
+        this.qrCodeUrl = url;
+      } 
     },
 
   }
@@ -3349,24 +3353,27 @@
     .qr-code-div{
   border-radius:10px;
   background-color: RGB(245,245,245); 
-  width: 200px; 
-  height: 200px; 
+  width: 180px; 
+  height: 180px; 
   position:absolute;
-  right:0;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 .qr-code{
-  width: 190px; 
-  height: 190px; 
+  width: 180px; 
+  height: 180px; 
   z-index: 999;
   }
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 205px; 
-  height: 205px; 
+  // width: 205px; 
+  // height: 205px; 
 
 }
+a:hover{
+  cursor: pointer;
+  color: #5a9cf8
+}
 </style>

src/views/major/productionIn.vue

@@ -140,6 +140,7 @@ export default {
     }
   },
   created() {
+    this.warehouseDialog = this.$route.query.openDialog === 'true';
     this.getList();
   },
   methods: {

src/views/major/todoDetail.vue

@@ -744,9 +744,9 @@
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item prop="validateCode" label-width="140px" class="postInfo-container-item"
                         label="打印二维码：">
+                        <a @mouseenter="showQrCode(props.row.qrCode)">出入库二维码</a> <a @mouseenter="showQrCode(props.row.validateCode)" style="margin-left: 5px">验证二维码</a>
                         <div class="qr-code-div">
-                          <img id="validateCode" class="qr-code" @click="printQR(props.row.validateCode)"
-                            :src="props.row.qrCode" alt="没有产品" />
+                          <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="没有产品" @click="printQR()"/>
                         </div>
                       </el-form-item>
                     </el-col>
@@ -1915,6 +1915,7 @@ export default {
       secondCheckUserId: null,
       secondCheckUsers: [],
       productionFinance: [],
+      qrCodeUrl:null
     }
   },
   created() {
@@ -3473,7 +3474,8 @@ export default {
         }
       })
     },
-    printQR(path) {
+    printQR() {
+      let path = this.qrCodeUrl;
       if (path) {
         let routeUrl = this.$router.resolve({
           path: `/print/code?path=${path}`
@@ -3503,6 +3505,9 @@ export default {
           duration: 2000
         });
       }
+    },
+    showQrCode(url){
+      this.qrCodeUrl = url;
     }
   },
 }
@@ -3566,26 +3571,30 @@ export default {
 .qr-code-div {
   border-radius: 10px;
   background-color: RGB(245, 245, 245);
-  width: 200px;
-  height: 200px;
+  width: 180px;
+  height: 180px;
   position: absolute;
-  right: 0;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
 .qr-code {
-  width: 190px;
-  height: 190px;
+  width: 180px;
+  height: 180px;
   z-index: 999;
 }
 
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 205px;
-  height: 205px;
+  // width: 180px;
+  // height: 180px;
+
+}
 
+a:hover{
+  cursor: pointer;
+  color: #5a9cf8
 }
 </style>

src/views/major/todoList.vue

@@ -293,6 +293,12 @@ export default {
           this.$router.push(`/major/my/order?todoBusinessId=${row.businessId}&sNo=${statementNo}&tId=${row.taskId}&cId=${row.currentNodeId}`)
          return;
       }
+      if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+          this.$router.push(`/major/production/in?openDialog=${true}`)
+          return;
+      }
       if (reportNo && statementNo){
         this.$router.push(`/major/todo/detail?id=${row.businessId}&reportNo=${reportNo}&statementNo=${row.statementNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
       }else if (!reportNo && statementNo){

src/views/personal/readonlyDetail.vue

@@ -355,13 +355,15 @@
                 </el-switch>
               </el-form-item>
             </el-col>
-            <el-col :xs="12" :sm="12" :lg="4" :span="6">
+            <el-col :xs="12" :sm="12" :lg="6" :span="6">
               <el-form-item label="打印二维码：" prop="validateCode" label-width="140px" class="postInfo-container-item">
+                <a @mouseenter="showQrCode(target.qrCode)">出入库二维码</a> <a @mouseenter="showQrCode(target.validateCode)" style="margin-left: 5px">验证二维码</a>
                 <div class="qr-code-div">
-                  <img id="validateCode" class="qr-code" :src="target.validateCode" alt="未定价" @click="printQR()"/>
+                  <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="未定价" @click="printQR()"/>
                 </div>
               </el-form-item>
             </el-col>
+            
           </el-row>
           <el-row class="row-style">
             <el-col :xs="12" :sm="12" :lg="18" :span="6">
@@ -1248,6 +1250,7 @@ export default {
       houseShow:false,
       immovalbeShow:false,
       landShow:false,
+      qrCodeUrl:null
 
     }
   },
@@ -1467,12 +1470,15 @@ export default {
       })
     },
     printQR(){
-      const path = this.target.validateCode;
+      const path = this.qrCodeUrl;
       let routeUrl = this.$router.resolve({
           path: `/print/code?path=${path}`
       });
       window.open(routeUrl.href, '_blank');
   
+    },
+    showQrCode(url){
+      this.qrCodeUrl = url;
     }
   }
 }
@@ -1576,8 +1582,8 @@ export default {
 .qr-code-div{
   border-radius:10px;
   background-color: RGB(245,245,245); 
-  width: 200px; 
-  height: 200px; 
+  width: 180px; 
+  height: 180px; 
   position:absolute;
   top:-10;
   left:0;
@@ -1586,15 +1592,19 @@ export default {
   align-items: center;
 }
 .qr-code{
-  width: 190px; 
-  height: 190px; 
+  width: 180px; 
+  height: 180px; 
   z-index: 999;
   }
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 205px; 
-  height: 205px; 
+  // width: 205px; 
+  // height: 205px; 
 
 }
+a:hover{
+  cursor: pointer;
+  color: #5a9cf8
+}
 </style>

src/views/personal/todoDetail.vue

@@ -385,10 +385,11 @@
                 </el-switch>
               </el-form-item>
             </el-col>
-            <el-col :xs="12" :sm="12" :lg="4" :span="6">
+            <el-col :xs="12" :sm="12" :lg="6" :span="6">
               <el-form-item label="打印二维码：" prop="validateCode" label-width="140px" class="postInfo-container-item">
+                <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号.png')">出入库二维码</a> <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号_validate.png')" style="margin-left: 5px">验证二维码</a>
                 <div class="qr-code-div">
-                  <img id="validateCode" class="qr-code" :src="target.validateCode" alt="未定价" @click="printQR()" />
+                  <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="未定价" @click="printQR()"/>
                 </div>
               </el-form-item>
             </el-col>
@@ -1531,7 +1532,8 @@ export default {
       houseShow: false,
       immovalbeShow: false,
       landShow: false,
-      changeCredentials: []
+      changeCredentials: [],
+      qrCodeUrl:null
 
     }
   },
@@ -2459,7 +2461,7 @@ export default {
       }
     },
     printQR() {
-      const path = this.target.validateCode;
+      const path = this.qrCodeUrl;
       console.log(path)
       if (!path) {
         this.$message("二维码还未生成，无法打印。")
@@ -2470,6 +2472,10 @@ export default {
       });
       window.open(routeUrl.href, '_blank');
 
+    },
+    showQrCode(url){
+      console.log(url)
+      this.qrCodeUrl = url;
     }
   }
 }
@@ -2574,8 +2580,8 @@ export default {
 .qr-code-div {
   border-radius: 10px;
   background-color: RGB(245, 245, 245);
-  width: 200px;
-  height: 200px;
+  width: 180px;
+  height: 180px;
   position: absolute;
   top: -10;
   left: 0;
@@ -2585,17 +2591,21 @@ export default {
 }
 
 .qr-code {
-  width: 190px;
-  height: 190px;
+  width: 180px;
+  height: 180px;
   z-index: 999;
 }
 
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 205px;
-  height: 205px;
+  width: 180px;
+  height: 180px;
 
 }
+a:hover{
+  cursor: pointer;
+  color: #5a9cf8
+}
 </style>
   

src/views/personal/todoList.vue

@@ -294,7 +294,11 @@ export default {
       else if (row.nodeCode === 'BUSINESS_ARCHIVING'){
           this.$router.push(`/personal/toSaveFile`)
          return;
-      }
+      }else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
+          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
+          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+            this.$router.push(`/major/production/in?openDialog=${true}`)
+          }
       else{
         this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&isOnline=${row.isOnline}&back=${'/personal/todo/list'}`)
       }