Startseite Erkunden Hilfe
Anmelden
zhangqi
/
yos_web
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Merge branch 'mergeBranch' into greenUrgent

# Conflicts:
#	src/components/dialogTemplate/index2.vue
qymljy vor 6 Monaten
Ursprung
3989369e33 a6114f3e84
Commit
a66829546a
17 geänderte Dateien mit 814 neuen und 132 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 124 55
      public/codeToFile.html
  2. 207 0
      public/codeToFileCopy.html
  3. BIN
      public/img/background.png
  4. BIN
      public/img/datum.png
  5. BIN
      public/img/logo.png
  6. 3 3
      src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue
  7. 20 9
      src/HDrpManagement/dispatch/modules/printMaterials.vue
  8. 26 3
      src/HDrpManagement/logistics/modules/print.vue
  9. 299 22
      src/HDrpManagement/orderManage/details/index.vue
  10. 90 0
      src/HDrpManagement/orderManage/details/tabs/setMaterial.vue
  11. 6 4
      src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue
  12. 1 1
      src/SDrpManagement/QuotedPrice/detail/index.vue
  13. 3 3
      src/components/dialogTemplate/index2.vue
  14. 2 2
      src/components/newLayout/modules/aside.vue
  15. 1 1
      src/optionSystem/FProductManage/index.vue
  16. 19 16
      src/views/mediaStatistics/modules/futureTwelveMonths.vue
  17. 13 13
      src/views/mediaStatistics/modules/salesfunnel.vue

+ 124 - 55
public/codeToFile.html
Datei anzeigen 

@@ -2,57 +2,126 @@
 
 <html lang="en">
 
     <head>
 
         <meta charset="UTF-8">
 
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         <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;
 
+            body {
 
+                margin: 0; /* 移除默认的边距 */
 
+                padding: 0; /* 移除默认的填充 */
 
+                background-color: #003399;
 
+            }
 
+            .logo-margin{
 
+                margin: -25pt 0 0 30pt;
 
+                position: absolute;
 
+            }
 
+            .img-div{
 
+                width: 100%;
 
+                height: 153pt;
 
+                background-color: #AAB7CB ;
 
+                background-image: url('./img/background.png');
 
+                background-size: cover; /* 可选：使背景图片覆盖整个div */
 
+                background-position: center; /* 可选：居中显示背景图片 */
 
+                background-repeat: no-repeat; /* 可选：防止背景图片重复 */
 
+                position: relative;
 
+                margin-top: 40px;
 
+            }
 
+            .logo-margin1{
 
+                margin: -25pt 0 0 30pt;
 
+                position: absolute;
 
             }
 
             .title-div{
 
-                width:100%;
 
-                height:50px;
 
-                margin:0 0 60px 30pt
 
+                width: 100%;
 
+                height:25px;
 
+                margin:30px 0 10px 0;
 
             }
 
             .title-font{
 
-                font-size: 40pt;
 
-                height:50px;
 
-                line-height: 50px;
 
+                font-size: 20pt;
 
+                height:20px;
 
+                line-height: 20px;
 
                 vertical-align: auto;
 
                 text-align: left;
 
-                color: #333333;
 
+                color: #FFFFFF;
 
                 font-weight: bold
 
             }
 
             .margin-style{
 
-                margin:0 30pt 20pt 30pt
 
+                margin:30pt  0 30pt 0;
 
             }
 
             .div-border{
 
-                width: 100%;
 
-                height: 150px;
 
+                width: 88%;
 
+                height: 80px;
 
                 border-radius: 8pt;
 
-                border: #cccccc solid 1px;
 
+                background-color: #FFFFFF;
 
                 display: flex;
 
                 justify-content: left;
 
-                margin-bottom: 20px;
 
+                margin: 20px;
 
             }
 
             .img-style{
 
-                width: 90px;
 
-                height: 90px;
 
-                margin: 28px 0 0 20px;
 
+                width: 50px;
 
+                height: 50px;
 
+                margin: 15px 0 0 20px;
 
             }
 
             .content-style{
 
-                font-size: 30px;
 
+                font-size: 12px;
 
                 color: #333333;
 
-                margin: 30px 20px 0 20px;
 
+                margin: 15px 20px 0 20px;
 
+            }
 
+            .content-div{
 
+                width: 85%;
 
+                min-height: 200pt;
 
+                background-color: rgba(255, 255, 255, 0.3);
 
+                margin: auto;
 
+                overflow: auto;
 
+                border: 1px solid #707070;
 
+                border-radius: 10pt;
 
+            }
 
+            .container {
 
+                display: flex;
 
+                justify-content: center; /* 水平居中 */
 
+                align-items: center;     /* 垂直居中 */
 
+                height: 50pt;          /* 设置容器高度 */
 
+                background-color: rgba(255, 255, 255, 0.3);
 
+                width: 100%;
 
+                margin-top: 50pt;
 
+                font-size: 20pt;
 
+                margin-bottom: 20pt;
 
+            }
 
+            .inner {
 
+                color: #FFFFFF;
 
+            }
 
+            .container_div {
 
+                display: flex;
 
+                justify-content: center; /* 水平居中 */
 
+                align-items: center;     /* 垂直居中 */
 
+                height: 15pt;
 
+                width: 100%;
 
+                font-size: 10pt;
 
+                color: #FFFFFF;
 
             }
 
         </style>
 
     </head>
 
     <body>
 
-        <img src="./img/bnBag.png" width="90%" height="20%" class="img-margin">
 
+        <div class="img-div" id="backgroundDiv">
 
+            <img src="./img/logo.png" width="64pt" height="64pt" class="logo-margin">
 
+        </div>
 
         <div class="title-div">
 
-            <div class="title-font" >产品技术资料</div>
 
+            <img src="./img/datum.png" width="38pt" height="38pt" class="logo-margin1" style="margin-top: -10px">
 
+            <div class="title-font" style="margin-left: 90px">产品技术资料</div>
 
+        </div>
 
+        <div class="content-div" style="margin-top: 20pt">
 
+            <div  id="dataContainer"></div>
 
+        </div>
 
+        <div class="container">
 
+            <div class="inner" onclick="window.location.href='http://www.ibpchina.com/';">
 
+                品牌官网·点击跳转
 
+            </div>
 
         </div>
 
-        <div class="margin-style" id="dataContainer"></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;
 
@@ -83,46 +152,46 @@
 
                 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 = `
 
+                    .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)
 
-                            });
 
+                                dataContainer.appendChild(div);
 
+                                div.addEventListener('click', function() {
 
+                                    console.log(data.url)
 
+                                    downloadFile(data.url)
 
+                                });
 
+                            })
 
                         })
 
                     })
 
-                })
 
-                .catch(function (error) {
 
-                    console.log(error);
 
-                });
 
+                    .catch(function (error) {
 
+                        console.log(error);
 
+                    });
 
             }
 
             function downloadFile(fileUrl, fileType){
 
                 const link = document.createElement('a');

+ 207 - 0
public/codeToFileCopy.html
Datei anzeigen 

@@ -0,0 +1,207 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+    <head>
 
+        <meta charset="UTF-8">
 
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+        <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: -25pt 0 0 30pt;
 
+                position: absolute;
 
+            }
 
+            .img-div{
 
+                width: 100%;
 
+                height: 153pt;
 
+                background-color: #AAB7CB ;
 
+                background-image: url('./img/background.png');
 
+                background-size: cover; /* 可选：使背景图片覆盖整个div */
 
+                background-position: center; /* 可选：居中显示背景图片 */
 
+                background-repeat: no-repeat; /* 可选：防止背景图片重复 */
 
+                position: relative;
 
+                margin-top: 40px;
 
+            }
 
+            .logo-margin1{
 
+                margin: -25pt 0 0 30pt;
 
+                position: absolute;
 
+            }
 
+            .title-div{
 
+                width: 100%;
 
+                height:25px;
 
+                margin:30px 0 10px 0;
 
+            }
 
+            .title-font{
 
+                font-size: 20pt;
 
+                height:20px;
 
+                line-height: 20px;
 
+                vertical-align: auto;
 
+                text-align: left;
 
+                color: #FFFFFF;
 
+                font-weight: bold
 
+            }
 
+            .margin-style{
 
+                margin:30pt  0 30pt 0;
 
+            }
 
+            .div-border{
 
+                width: 88%;
 
+                height: 80px;
 
+                border-radius: 8pt;
 
+                background-color: #FFFFFF;
 
+                display: flex;
 
+                justify-content: left;
 
+                margin: 20px;
 
+            }
 
+            .img-style{
 
+                width: 50px;
 
+                height: 50px;
 
+                margin: 15px 0 0 20px;
 
+            }
 
+            .content-style{
 
+                font-size: 12px;
 
+                color: #333333;
 
+                margin: 15px 20px 0 20px;
 
+            }
 
+            .content-div{
 
+                width: 85%;
 
+                height: 200pt;
 
+                min-height: 200pt;
 
+                background-color: rgba(255, 255, 255, 0.3);
 
+                max-height: 200pt;
 
+                margin: auto;
 
+                overflow: auto;
 
+                border: 1px solid #707070;
 
+                border-radius: 10pt;
 
+            }
 
+            .container {
 
+                display: flex;
 
+                justify-content: center; /* 水平居中 */
 
+                align-items: center;     /* 垂直居中 */
 
+                height: 50pt;          /* 设置容器高度 */
 
+                background-color: rgba(255, 255, 255, 0.3);
 
+                width: 100%;
 
+                margin-top: 50pt;
 
+                font-size: 20pt;
 
+                margin-bottom: 20pt;
 
+            }
 
+            .inner {
 
+                color: #FFFFFF;
 
+            }
 
+            .container_div {
 
+                display: flex;
 
+                justify-content: center; /* 水平居中 */
 
+                align-items: center;     /* 垂直居中 */
 
+                height: 15pt;
 
+                width: 100%;
 
+                font-size: 10pt;
 
+                color: #FFFFFF;
 
+            }
 
+        </style>
 
+    </head>
 
+    <body>
 
+        <div class="img-div" id="backgroundDiv">
 
+            <img src="./img/logo.png" width="64pt" height="64pt" class="logo-margin">
 
+        </div>
 
+        <div class="title-div">
 
+            <img src="./img/datum.png" width="38pt" height="38pt" class="logo-margin1" style="margin-top: -10px">
 
+            <div class="title-font" style="margin-left: 90px">产品技术资料</div>
 
+        </div>
 
+        <div class="content-div" style="margin-top: 20pt">
 
+            <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>

BIN
public/img/background.png
Datei anzeigen


BIN
public/img/datum.png
Datei anzeigen


BIN
public/img/logo.png
Datei anzeigen


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

@@ -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

+ 20 - 9
src/HDrpManagement/dispatch/modules/printMaterials.vue
Datei anzeigen 

@@ -87,21 +87,24 @@ export default {
 
   methods:{
 
     addBtn(type){
 
       if (type == '质保书'){
 
-        this.list = [
 
-          {
 
-            name:'质保书'
 
-          }
 
-        ]
 
         this.nowSelect = type
 
         this.idName = 'sa_dispatchid'
 
         this.dataid = this.$route.query.id
 
         this.drawerTitle = '打印质保书'
 
         this.drawer = true
 
+        this.param.id = 2025111813494102
 
+        this.param.content.pageNumber = 1
 
+        this.loading = true
 
+        this.param.content.size = 15
 
+        this.heightTable = 'calc(100vh - 160px)'
 
+        this.listData()
 
+
 
       }else if (type == '检验报告'){
 
         this.nowSelect = type
 
         this.idName = 'sa_dispatch_itemsid'
 
         this.drawerTitle = '打印检验报告'
 
-        this.param.content.pageNUmber = 1
 
+        this.param.content.pageNumber = 1
 
+        this.param.id = 20221115104703
 
         this.drawer = true
 
         this.loading = true
 
         this.heightTable = 'calc(100vh - 160px)'
 
@@ -141,7 +144,15 @@ export default {
 
       if (this.nowSelect == '合格证'){
 
         tableData = res.data.map((item,index)=>{
 
           return {
 
-            name:'合格证' + (index + 1),
 
+            name:index == 0?'合格证' + (index + 1)+'-'+(index + this.param.content.size):'合格证' + ((index * this.param.content.size) + 1)+'-'+(((index + 1 ) * this.param.content.size)),
 
+            startid:item.startid,
 
+            endid:item.endid
 
+          }
 
+        })
 
+      }else if(this.nowSelect == '质保书'){
 
+        tableData = res.data.map((item,index)=>{
 
+          return {
 
+            name:index == 0?'质保书' + (index + 1)+'-'+(index + this.param.content.size):'质保书' + ((index * this.param.content.size) + 1)+'-'+(((index + 1 ) * this.param.content.size)),
 
             startid:item.startid,
 
             endid:item.endid
 
           }
 
@@ -182,7 +193,7 @@ export default {
 
         })
 
       }else {
 
         this.param.id = 2025110115370902
 
-        this.param.content.pageNUmber = 1
 
+        this.param.content.pageNumner = 1
 
         this.drawer = true
 
         this.loading = true
 
         this.heightTable = 'calc(100vh - 160px)'
 
@@ -205,7 +216,7 @@ export default {
 
 
         })
 
       }else {
 
-        if (this.nowSelect == '合格证'){
 
+        if (this.nowSelect == '合格证' || this.nowSelect == '质保书'){
 
           window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
 
           // window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
 
         }else {

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

@@ -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
 
         }
 
       })

+ 299 - 22
src/HDrpManagement/orderManage/details/index.vue
Datei anzeigen 

@@ -15,12 +15,15 @@
 
         @onTabClick="onTabClick"
 
         @pageChange="pageChange"
 
         @onEditSuccess="queryMainData($route.query.id)">
 
+        <div slot="customOperationBef">
 
+          <setMaterial v-if="tool.checkAuth($route.name,'setMaterial')" @setSuccess="queryMainData" :data="mainData" :disabled="mainData.status == '审核' || mainData.status == '关闭'"></setMaterial>
 
+        </div>
 
         <div slot="customOperation"  v-if="Object.keys(mainData).length > 0">
 
           <!-- <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && (mainData.status == '新建')" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" /> -->
 
           <Edit style="display: inline-block !important;"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
 
 <!--          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />-->
 
           <EditRemark style="margin-right: 20px !important;" v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
 
-          <EditRemark style="margin-right: 20px !important;margin-left: -10px" v-if="mainData.status !== '新建' && tool.checkAuth($route.name,'editRemark')" :data="mainData" @onSuccess="queryMainData"></EditRemark>
 
+          <EditRemark style="margin-right: 20px !important;margin-left: -2px" v-if="mainData.status !== '新建' && tool.checkAuth($route.name,'editRemark')" :data="mainData" @onSuccess="queryMainData"></EditRemark>
 
           <changeSaler class="inline-16" style="margin-left: -10px" ref="saler" @selectRow="salerChange" :isPlain="true">
 
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">{{$t(`变更业务员`)}}</el-button>
 
           </changeSaler>
 
@@ -160,6 +163,7 @@ import changeHistory from './tabs/changeHistory.vue'
 
 import importFile from './importFile.vue'
 
 import EditRemark from '../modules/EditRemark.vue'
 
 import dialogTemplate from "@/template/dialogTemplate/index";
 
+import setMaterial from "./tabs/setMaterial";
 
 export default {
 
   name: "detail",
 
   data() {
 
@@ -208,7 +212,8 @@ export default {
 
     changeHistory,
 
     importFile,
 
     EditRemark,
 
-    dialogTemplate
 
+    dialogTemplate,
 
+    setMaterial
 
   },
 
   methods:{
 
     async orderreviewtype () {
 
@@ -259,7 +264,7 @@ export default {
 
     },
 
     changeDataStructure() {
 
       let that = this
 
-      this.mainAreaData = that.siteid == 'HY'?[
 
+      this.mainAreaData = that.siteid == 'HY' && this.tool.checkAuth(this.$route.name,'setMaterial')?[
 
         {
 
           label:'订单状态',
 
           value:this.$t(this.mainData.status),
 
@@ -391,8 +396,145 @@ export default {
 
         {
 
           label:'关联合同',
 
           value:this.mainData.contract_title
 
+        },
 
+        {
 
+          label:'材料',
 
+          value:this.mainData.material
 
         }
 
-      ]:[
 
+      ]:that.siteid == 'HY'?[
 
+        {
 
+          label:'订单状态',
 
+          value:this.$t(this.mainData.status),
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.status)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'订单类型',
 
+          value:this.mainData.type
 
+        },
 
+        {
 
+          label:'明细分类',
 
+          value:this.mainData.typemx
 
+        },
 
+        {
 
+          label:'单据日期',
 
+          value:this.mainData.billdate
 
+        },
 
+        {
 
+          label:'企业名称',
 
+          value:this.mainData.enterprisename
 
+        },
 
+        {
 
+          label:'订单总金额',
 
+          value:this.tool.formatAmount(this.mainData.defaultamount,2),
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'折后总金额',
 
+          value:this.tool.formatAmount(this.mainData.amount,2),
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'合计数量',
 
+          value:this.mainData.qty,
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'品牌',
 
+          value:this.mainData.brandname
 
+        },
 
+        {
 
+          label:'领域',
 
+          value:this.mainData.tradefield
 
+        },
 
+        {
 
+          label:'领域明细',
 
+          value:this.mainData.tradefieldmx
 
+        },
 
+        {
 
+          label:'评审类型',
 
+          value:this.mainData.optiontyperemarks?this.mainData.reviewtype + '-' + this.mainData.optiontyperemarks : this.mainData.reviewtype
 
+        },
 
+        {
 
+          label:'业务员',
 
+          value:this.mainData.saler_name
 
+        },
 
+        {
 
+          label:'项目信息',
 
+          value:this.mainData.projectname
 
+        },
 
+        {
 
+          label:'销售分类',
 
+          value:`${this.mainData.saletype}${this.mainData.saletyperemarks?'-':''}${this.mainData.saletyperemarks}`
 
+        },
 
+        {
 
+          label:'运费方式',
 
+          value:this.$t(this.mainData.freightstatus)
 
+        },
 
+        {
 
+          label:'备注',
 
+          value:this.mainData.remarks
 
+        },
 
+        /*{
 
+          label:'返利金使用比例(%)',
 
+          value:this.mainData.rebate_userate
 
+        },*/
 
+        {
 
+          label:'退回原因',
 
+          value:this.mainData.backreason
 
+        },
 
+        {
 
+          label:'核销状态',
 
+          value:this.mainData.writeoffstatus,
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'开票状态',
 
+          value:this.mainData.invoicestatus,
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.invoicestatus)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'备货状态',
 
+          value:this.$t(this.mainData.goodsstatus),
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'erp单号',
 
+          value:this.mainData.erpbillno
 
+        },
 
+        {
 
+          label:'回签单',
 
+          value:this.mainData.signbackstatus
 
+        },
 
+        {
 
+          label:'项目备注',
 
+          value:this.mainData.projectnote
 
+        },
 
+        {
 
+          label:'关联合同',
 
+          value:this.mainData.contract_title
 
+        },
 
+      ]:this.tool.checkAuth(this.$route.name,'setMaterial')?[
 
         {
 
           label:'订单状态',
 
           value:this.$t(this.mainData.status),
 
@@ -516,7 +658,136 @@ export default {
 
         {
 
           label:'关联合同',
 
           value:this.mainData.contract_title
 
+        },
 
+        {
 
+          label:'材料',
 
+          value:this.mainData.material
 
         }
 
+      ]:[
 
+        {
 
+          label:'订单状态',
 
+          value:this.$t(this.mainData.status),
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.status)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'订单类型',
 
+          value:this.mainData.type
 
+        },
 
+        {
 
+          label:'明细分类',
 
+          value:this.mainData.typemx
 
+        },
 
+        {
 
+          label:'单据日期',
 
+          value:this.mainData.billdate
 
+        },
 
+        {
 
+          label:'企业名称',
 
+          value:this.mainData.enterprisename
 
+        },
 
+        {
 
+          label:'订单总金额',
 
+          value:this.tool.formatAmount(this.mainData.defaultamount,2),
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'折后总金额',
 
+          value:this.tool.formatAmount(this.mainData.amount,2),
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'合计数量',
 
+          value:this.mainData.qty,
 
+          style:function () {
 
+            let style = {color:"#ff0000"}
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'品牌',
 
+          value:this.mainData.brandname
 
+        },
 
+        {
 
+          label:'领域',
 
+          value:this.mainData.tradefield
 
+        },
 
+        {
 
+          label:'领域明细',
 
+          value:this.mainData.tradefieldmx
 
+        },
 
+        {
 
+          label:'评审类型',
 
+          value:this.mainData.optiontyperemarks?this.mainData.reviewtype + '-' + this.mainData.optiontyperemarks : this.mainData.reviewtype
 
+        },
 
+        {
 
+          label:'业务员',
 
+          value:this.mainData.saler_name
 
+        },
 
+        {
 
+          label:'项目信息',
 
+          value:this.mainData.projectname
 
+        },
 
+        {
 
+          label:'销售分类',
 
+          value:`${this.mainData.saletype}${this.mainData.saletyperemarks?'-':''}${this.mainData.saletyperemarks}`
 
+        },
 
+        {
 
+          label:'运费方式',
 
+          value:this.$t(this.mainData.freightstatus)
 
+        },
 
+        {
 
+          label:'备注',
 
+          value:this.mainData.remarks
 
+        },
 
+        /*{
 
+          label:'返利金使用比例(%)',
 
+          value:this.mainData.rebate_userate
 
+        },*/
 
+        {
 
+          label:'退回原因',
 
+          value:this.mainData.backreason
 
+        },
 
+        {
 
+          label:'核销状态',
 
+          value:this.mainData.writeoffstatus,
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'开票状态',
 
+          value:this.mainData.invoicestatus,
 
+          style:function () {
 
+            let style = that.tool.getStatusColor(that.mainData.invoicestatus)
 
+            return style
 
+          }
 
+        },
 
+        {
 
+          label:'erp单号',
 
+          value:this.mainData.erpbillno
 
+        },
 
+        {
 
+          label:'回签单',
 
+          value:this.mainData.signbackstatus
 
+        },
 
+        {
 
+          label:'项目备注',
 
+          value:this.mainData.projectnote
 
+        },
 
+        {
 
+          label:'关联合同',
 
+          value:this.mainData.contract_title
 
+        },
 
       ]
 
     },
 
     // 监听切换数据,上一页,下一页
 
@@ -570,25 +841,10 @@ export default {
 
           cancelButtonText: this.$t('取消'),
 
           type: 'warning'
 
         }).then(async () => {
 
+          console.log(this.tabNow,'tabNow',this.$refs.prod.time)
 
           if (this.tabNow != 'tab0' || this.$refs.prod.time == null){
 
-            const res = await this.$api.requested({
 
-              "id": type === '审核'?20221108153502:20221108153402,
 
-              "content": {
 
-                "sa_orderid": this.mainData.sa_orderid,
 
-                "sys_enterpriseid": this.mainData.sys_enterpriseid,
 
-                "sa_accountclassid": this.mainData.accountclass.sa_accountclassid,
 
-                "reviewtype":type === '审核'?this.value:''
 
-              },
 
-            })
 
-            this.tool.showMessage(res,async ()=>{
 
-              this.queryMainData()
 
-              // if (type == '审核' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
 
-              //   this.querySetDay()
 
-              // }else {
 
-              //   this.visible = false
 
-              //   this.queryMainData()
 
-              // }
 
-            })
 
+            console.log('2222222222222222222222')
 
+            this.onSubmitRe(type)
 
           }else {
 
             this.typeNew = type
 
           }
 
@@ -600,6 +856,27 @@ export default {
 
         });
 
       }
 
     },
 
+    async onSubmitRe(type){
 
+      const res = await this.$api.requested({
 
+        "id": type === '审核'?20221108153502:20221108153402,
 
+        "content": {
 
+          "sa_orderid": this.mainData.sa_orderid,
 
+          "sys_enterpriseid": this.mainData.sys_enterpriseid,
 
+          "sa_accountclassid": this.mainData.accountclass.sa_accountclassid,
 
+          "reviewtype":type === '审核'?this.value:'',
 
+          "isCheckMaterial":type === '审核'?this.tool.checkAuth(this.$route.name,'setMaterial'):''
 
+        },
 
+      })
 
+      this.tool.showMessage(res,async ()=>{
 
+        this.queryMainData()
 
+        // if (type == '审核' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
 
+        //   this.querySetDay()
 
+        // }else {
 
+        //   this.visible = false
 
+        //   this.queryMainData()
 
+        // }
 
+      })
 
+    },
 
     // 反审核订单
 
     onReturnCheck () {
 
       this.$confirm(this.$t(`是否反审核该订单`), this.$t('提示'), {

+ 90 - 0
src/HDrpManagement/orderManage/details/tabs/setMaterial.vue
Datei anzeigen 

@@ -0,0 +1,90 @@
 
+<template>
 
+  <dialogTemplate ref="dialogRef" btn-title="设置材质" btn-type="primary" dialog-title="设置材质" @onSubmit="onSubmit" @dialogShow="dialogShow" :disabled="disabled">
 
+    <template #formRule>
 
+      <el-form
 
+          ref="form"
 
+          :model="form"
 
+          :rules="rules"
 
+          label-position="right"
 
+          :label-width="tool.onlyZh('100px')"
 
+          size="mini"
 
+      >
 
+        <el-form-item :label="$t('材质') + ':'" prop="material">
 
+          <el-select
 
+              v-model="form.material"
 
+              :placeholder="$t('请选择材质')"
 
+              @focus="queryType('itemmaterial')"
 
+              style="width: 80%"
 
+          >
 
+            <el-option
 
+                v-for="item in options.itemmaterial"
 
+                :key="item.value"
 
+                :label="$t(item.value)"
 
+                :value="item.value"
 
+            >
 
+              <span style="float: left">{{ $t(item.value) }}</span>
 
+            </el-option>
 
+          </el-select>
 
+        </el-form-item>
 
+      </el-form>
 
+    </template>
 
+  </dialogTemplate>
 
+</template>
 
+
 
+<script>
 
+import dialogTemplate from "@/components/dialogTemplate/index2";
 
+export default {
 
+  name: "setMaterial",
 
+  components:{dialogTemplate},
 
+  props:['data','disabled'],
 
+  data(){
 
+    return {
 
+      options:{
 
+        itemmaterial:[]
 
+      },
 
+      form:{
 
+        material:''
 
+      },
 
+      rules:{
 
+        material: [
 
+          {
 
+            required: true,
 
+            message: this.$t("请选择材质"),
 
+            trigger: "change",
 
+          },
 
+        ],
 
+      }
 
+    }
 
+  },
 
+  methods:{
 
+    dialogShow(){
 
+      this.form.material = this.data.material
 
+    },
 
+    onSubmit(){
 
+      this.$refs.form.validate(async (valid)=>{
 
+        if (!valid) return false
 
+        const res = await this.$api.requested({
 
+          "content": {
 
+            "sa_orderid": this.$route.query.id,
 
+            "material": this.form.material
 
+          },
 
+          "id": 2025111013214902,
 
+        })
 
+        this.tool.showMessage(res,()=>{
 
+          this.$refs.dialogRef.dialogTableVisible = false
 
+          this.$emit('setSuccess')
 
+        })
 
+      })
 
+    },
 
+    /*获取分类*/
 
+    async queryType(val){
 
+      const res = await this.$store.dispatch("optiontypeselect", val)
 
+      this.options[val] = res.data
 
+    },
 
+  }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+
 
+</style>

+ 6 - 4
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue
Datei anzeigen 

@@ -122,22 +122,24 @@
 
             >{{ $t("装箱数") }}：{{ selectProduct.packqty }}</span
 
           >
 
           <span style="color: #888; font-size: 14px; margin-left: 10px"
 
-            >{{ $t("库存") }}：
 
-            <template v-if="usertype === 0 || usertype === 1">
 
+            v-if="tool.checkAuth($route.name,'Inventory_Number') || tool.checkAuth($route.name,'Inventory_Text')">{{ $t("库存") }}：
 
+            <template v-if="tool.checkAuth($route.name,'Inventory_Number')">
 
               <span>{{ stockData.invbal_qty }}</span>
 
             </template>
 
-            <template v-else>
 
+            <template v-if="tool.checkAuth($route.name,'Inventory_Text')" >
 
               <span
 
                 v-if="stockData.stockstatus === '紧缺'"
 
                 style="color: red"
 
+                :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}"
 
                 >{{ $t(stockData.stockstatus) }}</span
 
               >
 
               <span
 
                 v-else-if="stockData.stockstatus === '充足'"
 
                 style="color: green"
 
+                :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}"
 
                 >{{ $t(stockData.stockstatus) }}</span
 
               >
 
-              <span v-else>{{ $t(stockData.stockstatus) }}</span>
 
+              <span v-else :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}">{{ $t(stockData.stockstatus) }}</span>
 
             </template>
 
           </span>
 
         </div>

+ 1 - 1
src/SDrpManagement/QuotedPrice/detail/index.vue
Datei anzeigen 

@@ -20,7 +20,7 @@
 
       <div slot="customOperation">
 
         <!-- 此区域提供了自定义操作按钮 -->
 
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :disabled="disabledFlag.disabled" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
 
-        <revoke class="inline-16" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '提交'" :disabled="disabledFlag.disabled" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onRevoke="onSuccess"></revoke>
 
+        <revoke class="inline-16" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '提交' && (userInfo.siteid != 'HY' || (userInfo.siteid == 'HY' && (mainData.specialoffer != '1' || quotedpricerecheck != '1')))" :disabled="disabledFlag.disabled" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onRevoke="onSuccess"></revoke>
 
         <div v-if="userInfo.siteid == 'HY'" style="display: inline-block !important">
 
           <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :data="mainData"  :disabled="disabledFlag.disabled"
 
                       :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>

+ 3 - 3
src/components/dialogTemplate/index2.vue
Datei anzeigen 

@@ -38,7 +38,7 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-/deep/ .el-dialog__body {
 
-  padding: 0 20px 20px 20px !important;
 
-}
 
+  /deep/ .el-dialog__body {
 
+    padding: 0 20px 20px 20px !important;
 
+  }
 
 </style>

+ 2 - 2
src/components/newLayout/modules/aside.vue
Datei anzeigen 

@@ -22,7 +22,7 @@
 
         <el-divider class="divider"></el-divider>
 
         <!-- <p v-if="!collapse" style="padding:0 20px;font-size:12px;color:#eeeeee">应用</p> -->
 
         <!-- <el-divider content-position="left">应用</el-divider> -->
 
-        <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle" style="display: flex;align-items: center;padding-right: 20px !important;">
 
+        <el-menu-item :index="String(index + 'e')" v-for="(item,index) in menuApp" :key="index + 99" @click="handelMenuAppClick(item,'app')" @mouseenter.native="debounce(selectStyle,100)()" @mouseleave.native="outStyle" style="display: flex;align-items: center;padding-right: 20px !important;">
 
           <p class="" style="text-align:center" v-if="collapse">{{item.systemappname.substr(0, 1)}}</p>
 
             <span style="white-space: normal;word-break: break-all;line-height: 12px;flex: 1;" slot="title">{{$t(item.systemappname)}}</span>
 
           <i v-if="!collapse" style="float:right;line-height: 50px;" class="el-icon-error menuIconClose" @click.stop="deleteMenuApp(item)"></i>
 
@@ -57,7 +57,7 @@
 
         <el-divider class="divider"></el-divider>
 
         <!-- <p v-if="!collapse" style="padding:0 20px;font-size:12px;color:#eeeeee">应用</p> -->
 
         <!-- <el-divider content-position="left">应用</el-divider> -->
 
-        <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
 
+        <el-menu-item :index="String(index + 'e')" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
 
           <div slot="title"><span class="name__icon inline-16" style="text-align:center">{{item.systemappname.substr(0, 1)}}</span>{{$t(item.systemappname)}}</div>
 
         </el-menu-item>
 
       </div>

+ 1 - 1
src/optionSystem/FProductManage/index.vue
Datei anzeigen 

@@ -141,4 +141,4 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-</style>
 
+</style>

+ 19 - 16
src/views/mediaStatistics/modules/futureTwelveMonths.vue
Datei anzeigen 

@@ -94,23 +94,26 @@ export default {
 
     chartData(init,data){
 
       let index = 0
 
       let indexNew = 0
 
-      data.forEach((item,num) =>{
 
-        if (num == index){
 
-          this.chartMapData[indexNew] = {
 
-            "signdate_due":item.signdate_due,
 
-            "value":Math.round(this.tool.unitConversion(item.signamount_due,10000)*100)/100,
 
-            "name":this.$t('预计签约金额')+ this.$t('(万)')
 
-          }
 
-          indexNew = indexNew + 1
 
-          this.chartMapData[indexNew] = {
 
-            "signdate_due":item.signdate_due,
 
-            "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000)*100)/100,
 
-            "name":this.$t('预计成交金额') + this.$t('(万)')
 
+      if (data){
 
+        data.forEach((item,num) =>{
 
+          if (num == index){
 
+            this.chartMapData[indexNew] = {
 
+              "signdate_due":item.signdate_due,
 
+              "value":Math.round(this.tool.unitConversion(item.signamount_due,10000)*100)/100,
 
+              "name":this.$t('预计签约金额')+ this.$t('(万)')
 
+            }
 
+            indexNew = indexNew + 1
 
+            this.chartMapData[indexNew] = {
 
+              "signdate_due":item.signdate_due,
 
+              "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000)*100)/100,
 
+              "name":this.$t('预计成交金额') + this.$t('(万)')
 
+            }
 
+            indexNew = indexNew + 1
 
+            index = index + 1
 
           }
 
-          indexNew = indexNew + 1
 
-          index = index + 1
 
-        }
 
-      })
 
+        })
 
+      }
 
+
 
       console.log(this.chartMapData,'chartMapData')
 
       console.log(this.$refs.selectRef.$el.clientHeight,'高度&&&&&&&高度')
 
       this.height = 352

+ 13 - 13
src/views/mediaStatistics/modules/salesfunnel.vue
Datei anzeigen 

@@ -915,7 +915,7 @@ export default {
 
         this.previousData = [
 
           {
 
             title:'成交项目数',
 
-            value:res.data[0].extradata.dealTotalCount,
 
+            value:res.data?res.data[0].extradata.dealTotalCount:"",
 
             unit:'个',
 
             description:'当前状态为已成交，并且项目成交时间在前12个月（不含当前月）的项目数量',
 
             color:'#3874F6'
 
@@ -923,24 +923,24 @@ export default {
 
           {
 
             title:'预计成交正偏差',
 
             title1:'项目',
 
-            value1:res.data[0].extradata.positiveCount,
 
+            value1:res.data?res.data[0].extradata.positiveCount:"",
 
             unit1:'个',
 
             title2:'金额',
 
-            value2:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.positiveOffsetAmount,10000),2),
 
+            value2:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.positiveOffsetAmount:"",10000),2),
 
             unit2:'万元',
 
             description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为正数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的正数偏差金额'),
 
             color:'#E6A23C'
 
           },
 
           {
 
             title:'项目成交金额合计',
 
-            value:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.dealAmount,10000),2),
 
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.dealAmount:'',10000),2),
 
             unit:'万元',
 
             description:'合计当前状态为已成交，并且项目成交时间在前12个月（不含当前月）的项目订单金额',
 
             color: '#009966'
 
           },
 
           {
 
             title:'失败项目数',
 
-            value:res.data[0].extradata.failTotalCount,
 
+            value:res.data?res.data[0].extradata.failTotalCount:"",
 
             unit:'个',
 
             description:'当前状态为已失败，并且失败操作时间在前12个月（不含当前月）的项目数量',
 
             color:'#3874F6'
 
@@ -948,31 +948,31 @@ export default {
 
           {
 
             title:'预计成交负偏差',
 
             title1:'项目',
 
-            value1:res.data[0].extradata.negativeCount,
 
+            value1:res.data?res.data[0].extradata.negativeCount:"",
 
             unit1:'个',
 
             title2:'金额',
 
-            value2:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.negativeOffsetAmount,10000),2),
 
+            value2:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.negativeOffsetAmount:"",10000),2),
 
             unit2:'万元',
 
             description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为负数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的负数偏差金额'),
 
             color:'#E6A23C'
 
           },
 
           {
 
             title:'预计签约金额合计',
 
-            value:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.signAmount,10000),2),
 
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.signAmount:"",10000),2),
 
             unit:'万元',
 
             description:'合计当前状态为已成交，并且项目成交时间在前12个月（不含当前月）的项目预计签约金额',
 
             color: '#009966'
 
           },
 
           {
 
             title:'项目成交率',
 
-            value:Math.round((res.data[0].extradata.dealRate * 100)*100)/100,
 
+            value:res.data?Math.round((res.data[0].extradata.dealRate * 100)*100)/100:"",
 
             unit:'%',
 
             description:'项目成交率 = 成交项目数 ÷ （成交项目数 + 失败项目数）×100%',
 
             color:'#3874F6'
 
           },
 
           {
 
             title:'预计成交准确率',
 
-            value:Math.round((res.data[0].extradata.rightRate * 100)*100)/100,
 
+            value:res.data?Math.round((res.data[0].extradata.rightRate * 100)*100)/100:"",
 
             unit:'%',
 
             description:this.$t('依据：偏差率 = |（项目成交金额 - 预计签约金额）| ÷ 预计签约金额 × 100%') + '\n ' + this.$t('预计成交准确率 = 偏差率≤15%的项目数 ÷ 成交项目数 × 100%'),
 
             color:'#E6A23C'
 
@@ -981,20 +981,20 @@ export default {
 
         this.dataBoxData = [
 
           {
 
             title:'预计签约金额合计',
 
-            value:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.sumsignamount_due,10000),2),
 
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.sumsignamount_due:"",10000),2),
 
             unit:'万元',
 
             description:'合计未来12个月的项目预计签约金额',
 
             color: '#3874F6'
 
           },
 
           {
 
             title:'预计成交金额合计',
 
-            value:this.tool.formatAmount(this.tool.unitConversion(res.data[0].extradata.sumdealamount_due,10000),2),
 
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data?res.data[0].extradata.sumdealamount_due:"",10000),2),
 
             unit:'万元',
 
             description:'合计未来12个月的项目预计成交金额',
 
             color: '#E6A23C'
 
           },
 
         ]
 
-        this.futreData = res.data[0].extradata.array
 
+        this.futreData = res.data?res.data[0].extradata.array:""
 
         this.$refs.futureTwelveMonthsRef.chartData(init,this.futreData)
 
         this.projectList = res.data
 
         this.total = res.total