Переглянути джерело

物流单打印调整,信用调整

qymljy 5 місяців тому
батько
коміт
7f0658f8f3

+ 0 - 202
public/codeToFile1.html

@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <title>商品资料页</title>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-        <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
-        <style>
-            body {
-                margin: 0; /* 移除默认的边距 */
-                padding: 0; /* 移除默认的填充 */
-                background-color: #003399;
-            }
-            .logo-margin{
-                margin: -60pt 0 0 30pt;
-                position: absolute;
-            }
-            .img-div{
-                width: 100%;
-                height: 353pt;
-                background-color: #AAB7CB ;
-                background-image: url('./img/background.png');
-                background-size: cover; /* 可选:使背景图片覆盖整个div */
-                background-position: center; /* 可选:居中显示背景图片 */
-                background-repeat: no-repeat; /* 可选:防止背景图片重复 */
-                position: relative;
-                margin-top: 95px;
-            }
-            .title-div{
-                width: 100%;
-                height:50px;
-                margin:60px 0 60px 30pt
-            }
-            .title-font{
-                font-size: 40pt;
-                height:50px;
-                line-height: 50px;
-                vertical-align: auto;
-                text-align: left;
-                color: #FFFFFF;
-                font-weight: bold
-            }
-            .margin-style{
-                margin:30pt  0 30pt 0;
-            }
-            .div-border{
-                width: 90%;
-                height: 150px;
-                border-radius: 8pt;
-                background-color: #FFFFFF;
-                display: flex;
-                justify-content: left;
-                margin: 35px;
-            }
-            .img-style{
-                width: 90px;
-                height: 90px;
-                margin: 28px 0 0 20px;
-            }
-            .content-style{
-                font-size: 30px;
-                color: #333333;
-                margin: 30px 20px 0 20px;
-            }
-            .content-div{
-                width: 90%;
-                height: 500pt;
-                min-height: 500pt;
-                background-color: rgba(255, 255, 255, 0.3);
-                max-height: 500pt;
-                margin: auto;
-                overflow: auto;
-                border: 1px solid #707070;
-                border-radius: 10pt;
-            }
-            .container {
-                display: flex;
-                justify-content: center; /* 水平居中 */
-                align-items: center;     /* 垂直居中 */
-                height: 100pt;          /* 设置容器高度 */
-                background-color: rgba(255, 255, 255, 0.3);
-                width: 100%;
-                margin-top: 50pt;
-                font-size: 50pt;
-                margin-bottom: 50pt;
-            }
-            .inner {
-                color: #FFFFFF;
-            }
-            .container_div {
-                display: flex;
-                justify-content: center; /* 水平居中 */
-                align-items: center;     /* 垂直居中 */
-                height: 50pt;
-                width: 100%;
-                font-size: 30pt;
-                color: #FFFFFF;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="img-div" id="backgroundDiv">
-            <img src="./img/logo.png" width="164pt" height="164pt" class="logo-margin">
-        </div>
-        <div class="title-div">
-            <img src="./img/datum.png" width="84pt" height="84pt" class="logo-margin" style="margin-top: -10px">
-            <div class="title-font" style="margin-left: 160px">产品技术资料</div>
-        </div>
-        <div class="content-div" style="margin-top: 30pt">
-            <div id="dataContainer"></div>
-        </div>
-        <div class="container">
-            <div class="inner" onclick="window.location.href='http://www.ibpchina.com/';">
-                品牌官网·点击跳转
-            </div>
-        </div>
-
-        <div class="container_div">班尼戈</div>
-        <div class="container_div">水工业控制的可靠服务商</div>
-        <div class="container_div">客服电话:+86 0573-89053730</div>
-
-        <script>
-            window.onload = async function(){
-                var loc=location.href;
-                var n1=loc.length;
-                var n2=loc.indexOf('=');
-                var code=loc.slice(n2+1,n1)
-                let that = this
-                console.log(code)
-                let param = {
-                    "id": 2025082515112802,
-                    "content": {
-                        "code": code
-                    },
-                }
-                var str = window.location.href;
-                var index = str.indexOf('/');
-                var num = 0;
-                var strNew = ''
-                while(index !== -1) {
-                    num++;
-                    index = str.indexOf('/',index + 1);
-                    if (num++ === 3) {
-                        this.url = str.slice(0, index) + '/yosweb/codeToFile.html'
-                        strNew = str.slice(0, index)
-                    }
-                }
-                console.log(strNew)
-                var urlNew = strNew + '/yos/rest/index'
-                console.log(urlNew)
-                axios.post(urlNew, param)
-                    .then(function (response) {
-                        response.data.data.forEach((item,index) => {
-                            item.attinfos.forEach((data,rowindex) => {
-                                const div = document.createElement('div');
-                                div.className = 'div-border';
-                                let iconSrc = '';
-                                if (data.postfix == 'doc' || data.postfix == 'DOC' || data.postfix == 'docx' || data.postfix == 'DOCX') {
-                                    iconSrc = './img/word.svg';
-                                } else if (data.postfix == 'pdf' || data.postfix == 'PDF') {
-                                    iconSrc = './img/pdfType.svg';
-                                } else if (data.postfix == 'png' || data.postfix == 'PNG' || data.postfix == 'JPG' || data.postfix == 'jpg') {
-                                    iconSrc = './img/pngType.svg';
-                                }else if (data.postfix == 'ppt' || data.postfix == 'PPT') {
-                                    iconSrc = './img/ppt.svg';
-                                }else if (data.postfix == 'mp3' || data.postfix == 'MP3' || data.postfix == 'MP4' || data.postfix == 'mp4'
-                                    || data.postfix == 'mov' || data.postfix == 'MOV') {
-                                    iconSrc = './img/mov.svg';
-                                }else if (data.postfix == 'EXCEL' || data.postfix == 'excel' || data.postfix == 'xlsx' || data.postfix == 'XLSX') {
-                                    iconSrc = './img/excel.svg';
-                                } else {
-                                    iconSrc = './img/default.svg';
-                                }
-                                let remarks = data.document.split('.')[0]
-                                div.innerHTML = `
-                            <div class="div-border" >
-                                <img src="${iconSrc}" class="img-style">
-                                <div class="content-style">${data.document.split('.')[0]}</div>
-                            </div>
-                `;
-                                dataContainer.appendChild(div);
-                                div.addEventListener('click', function() {
-                                    console.log(data.url)
-                                    downloadFile(data.url)
-                                });
-                            })
-                        })
-                    })
-                    .catch(function (error) {
-                        console.log(error);
-                    });
-            }
-            function downloadFile(fileUrl, fileType){
-                const link = document.createElement('a');
-                link.href = fileUrl
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        </script>
-    </body>
-</html>

+ 0 - 136
public/codeToFileCopy.html

@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <title>商品资料页</title>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-        <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
-        <style>
-            .img-margin{
-                margin: 60pt 0 30pt 30pt;
-            }
-            .title-div{
-                width:100%;
-                height:50px;
-                margin:0 0 60px 30pt
-            }
-            .title-font{
-                font-size: 40pt;
-                height:50px;
-                line-height: 50px;
-                vertical-align: auto;
-                text-align: left;
-                color: #333333;
-                font-weight: bold
-            }
-            .margin-style{
-                margin:0 30pt 20pt 30pt
-            }
-            .div-border{
-                width: 100%;
-                height: 150px;
-                border-radius: 8pt;
-                border: #cccccc solid 1px;
-                display: flex;
-                justify-content: left;
-                margin-bottom: 20px;
-            }
-            .img-style{
-                width: 90px;
-                height: 90px;
-                margin: 28px 0 0 20px;
-            }
-            .content-style{
-                font-size: 30px;
-                color: #333333;
-                margin: 30px 20px 0 20px;
-            }
-        </style>
-    </head>
-    <body>
-        <img src="./img/bnBag.png" width="90%" height="20%" class="img-margin">
-        <div class="title-div">
-            <div class="title-font" >产品技术资料</div>
-        </div>
-        <div class="margin-style" id="dataContainer"></div>
-        <script>
-            window.onload = async function(){
-                var loc=location.href;
-                var n1=loc.length;
-                var n2=loc.indexOf('=');
-                var code=loc.slice(n2+1,n1)
-                let that = this
-                console.log(code)
-                let param = {
-                    "id": 2025082515112802,
-                    "content": {
-                        "code": code
-                    },
-                }
-                var str = window.location.href;
-                var index = str.indexOf('/');
-                var num = 0;
-                var strNew = ''
-                while(index !== -1) {
-                    num++;
-                    index = str.indexOf('/',index + 1);
-                    if (num++ === 3) {
-                        this.url = str.slice(0, index) + '/yosweb/codeToFile.html'
-                        strNew = str.slice(0, index)
-                    }
-                }
-                console.log(strNew)
-                var urlNew = strNew + '/yos/rest/index'
-                console.log(urlNew)
-                axios.post(urlNew, param)
-                .then(function (response) {
-                    response.data.data.forEach((item,index) => {
-                        item.attinfos.forEach((data,rowindex) => {
-                            const div = document.createElement('div');
-                            div.className = 'div-border';
-                            let iconSrc = '';
-                            if (data.postfix == 'doc' || data.postfix == 'DOC' || data.postfix == 'docx' || data.postfix == 'DOCX') {
-                                iconSrc = './img/word.svg';
-                            } else if (data.postfix == 'pdf' || data.postfix == 'PDF') {
-                                iconSrc = './img/pdfType.svg';
-                            } else if (data.postfix == 'png' || data.postfix == 'PNG' || data.postfix == 'JPG' || data.postfix == 'jpg') {
-                                iconSrc = './img/pngType.svg';
-                            }else if (data.postfix == 'ppt' || data.postfix == 'PPT') {
-                                iconSrc = './img/ppt.svg';
-                            }else if (data.postfix == 'mp3' || data.postfix == 'MP3' || data.postfix == 'MP4' || data.postfix == 'mp4'
-                                || data.postfix == 'mov' || data.postfix == 'MOV') {
-                                iconSrc = './img/mov.svg';
-                            }else if (data.postfix == 'EXCEL' || data.postfix == 'excel' || data.postfix == 'xlsx' || data.postfix == 'XLSX') {
-                                iconSrc = './img/excel.svg';
-                            } else {
-                                iconSrc = './img/default.svg';
-                            }
-                            let remarks = data.document.split('.')[0]
-                            div.innerHTML = `
-                            <div class="div-border" >
-                                <img src="${iconSrc}" class="img-style">
-                                <div class="content-style">${data.document.split('.')[0]}</div>
-                            </div>
-                `;
-                            dataContainer.appendChild(div);
-                            div.addEventListener('click', function() {
-                                console.log(data.url)
-                                downloadFile(data.url)
-                            });
-                        })
-                    })
-                })
-                .catch(function (error) {
-                    console.log(error);
-                });
-            }
-            function downloadFile(fileUrl, fileType){
-                const link = document.createElement('a');
-                link.href = fileUrl
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        </script>
-    </body>
-</html>

+ 3 - 3
src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue

@@ -2,14 +2,14 @@
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">{{$t('添 加')}}</el-button>
     <el-drawer :title="$t(`添加经销商`)" size="70%" append-to-body :show-close="false" :visible.sync="dialogFormVisible">
-      <div class="drawer__panel">
+      <div class="drawer__panel" style="margin-bottom: 0">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('90px')" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item :label="$t(`经销商`)" prop="remarks">
                 <el-input  style="width:200px;margin-bottom: 20px" :placeholder="$t('搜索')" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="getEnterpriseData(params.content.pageNumber = 1)" @clear="getEnterpriseData(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
                 </el-input>
-                <selectEnterpise v-if="dialogFormVisible" @selectChange="selectChange" idName="sys_enterpriseid" ref="table" v-model="result" :layout="tablecols" :data="list" :custom="true" height="500px"  @upDateData="upDateData">
+                <selectEnterpise v-if="dialogFormVisible" @selectChange="selectChange" idName="sys_enterpriseid" ref="table" v-model="result" :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 260px)"  @upDateData="upDateData">
                   <template v-slot:customcol="scope">
                     <div v-if="scope.column.columnname == 'province'">
                       {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
@@ -17,7 +17,7 @@
                     <div v-else>{{$t(scope.column.data[scope.column.columnname])}}</div>
                   </template>
                 </selectEnterpise>
-                <div class="container normal-panel" style="text-align:right">
+                <div class="container normal-panel" style="text-align:right;margin-bottom: 0">
                   <el-pagination
                       style="text-align:right"
                       background

+ 26 - 3
src/HDrpManagement/logistics/modules/print.vue

@@ -69,7 +69,9 @@ export default {
       total:0,
       currentPage:0,
       heightTable:260 + 'px',
-      loading:false
+      loading:false,
+      sys_reportid:'',
+      sys_reportid1:''
     }
   },
   methods:{
@@ -103,6 +105,25 @@ export default {
           this.sys_reportid = item.sys_reportid
         })
       }
+      const res1 = await this.$api.requested({
+        "id": "20221213094401",
+        "content": {
+          "isExport":0,
+          "pageNumber":1,
+          "pageSize":100,
+          "systemappid": 163,
+          "where":{
+            "condition":'装箱单2-HY'
+          }
+        },
+      })
+      if (res1.code == 0){
+        this.tool.showMessage(res1,()=>{})
+      }else {
+        res1.data.forEach(item=>{
+          this.sys_reportid1 = item.sys_reportid
+        })
+      }
     },
     async listData(){
       this.param.content.sa_logisticsid = this.$route.query.id
@@ -110,7 +131,8 @@ export default {
       let tableData = res.data.map(item=>{
         return {
           name:'箱码' + item.boxnum + '_装箱单',
-          sa_logistics_boxid:item.sa_logistics_boxid
+          sa_logistics_boxid:item.sa_logistics_boxid,
+          rowindex:item.rowindex
         }
       })
       this.list = tableData
@@ -129,11 +151,12 @@ export default {
       this.listData()
     },
     async printBtn (data) {
+      console.log(data,'data22222')
       this.dataid = data.sa_logistics_boxid
       let res = await this.$api.requested({
         "id":20221213094501,
         "content": {
-          sys_reportid:this.sys_reportid,
+          sys_reportid:data.rowindex == 1?this.sys_reportid:this.sys_reportid1,
           dataid:this.dataid
         }
       })