Jelajahi Sumber

提交代码

zyf 2 tahun lalu
induk
melakukan
bf07cd6a6f

+ 1 - 1
build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS'];
+//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS',"inward"];
 let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {

TEMPAT SAMPAH
dist.rar


+ 1 - 1
src/components/main.vue

@@ -338,7 +338,7 @@
               :hidden="badgeshow"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
-                >待办任务</el-button
+                >通知信息</el-button
               >
             </el-badge>
             <div class="Web_Notice" v-show="socketshow" style="z-index: 1 ; overflow-y: scroll">

+ 15 - 6
src/views/WMS/components/intrainst/intrainst_real.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- 在途实时库存 -->
-  <div class="homeworkPath">
-    <div class="sache">
+  <!-- 在途实时库存 class="homeworkPath"-->
+  <div>
+    <div class="homeworkPath1">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        clearable>
+        clearable style="width: 200px;margin-right: 20px">
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
@@ -30,16 +30,25 @@ export default {
     };
   },
   mounted() {
-    
+
   },
   methods: {
   },
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+/*.homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
   }
+}*/
+.homeworkPath1{
+  height: 60px;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  margin-top: 10px;
+  flex-wrap: wrap;
+  align-items: center;
 }
 </style>

+ 4 - 4
src/views/WMS/components/steel/steel_real.vue

@@ -11,12 +11,12 @@
           <el-option label="高线库" value="3"></el-option>
           <el-option label="配送库" value="4"></el-option>
         </el-select>
-        <el-select v-model="time" placeholder="一个月" style="width: auto;">
+<!--        <el-select v-model="time" placeholder="一个月" style="width: auto;">
           <el-option label="不选择月份" value="0"></el-option>
           <el-option label="一个月" value="1"></el-option>
           <el-option label="半个月" value="2"></el-option>
-        <!-- <el-option label="" value="3"></el-option> -->
-        </el-select>
+        &lt;!&ndash; <el-option label="" value="3"></el-option> &ndash;&gt;
+        </el-select>-->
         <el-button type="primary" class="btn" @click="onClick">
           <i class="el-icon-search"></i>查询
         </el-button>
@@ -41,7 +41,7 @@ export default {
       mapList:[],
       inputText:"",
       option: {
-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"0"+"&time="+"0",
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"1"+"&time="+"0",
       },
       rowId:''
     };

+ 11 - 1
src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -114,7 +114,7 @@
             :row-key="getRowKey"
             style="width: 100%; margin-top: 20px"
             @selection-change="handleSelectionChange"
-            max-height="600px"
+            max-height="500px"
           >
             <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
@@ -191,6 +191,7 @@
             max-height="500px"
           >
             <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column width="80" align="center" prop="Nosort" label="序号"></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
             <el-table-column prop="resultStartTime" label="排队开始时间">
@@ -488,6 +489,15 @@ export default {
           }
         }
       }
+
+      // 表格序号
+      let Nosort = 0
+      for(let n in this.spanArr){
+        if(this.spanArr[n]>0){
+          Nosort += 1
+          this.$set(data[n],'Nosort',Nosort)
+        }
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (

+ 87 - 1
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -22,7 +22,7 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"
+      <el-button type="primary" @click="exportAllExcel"
         ><i class="el-icon-download"></i>导出Excel</el-button
       >
     </div>
@@ -223,6 +223,7 @@ export default {
       addressId: null,
       //省市县(区)查询值
       addresText: null,
+      noSettleDetailsColumn:[],
       //达钢的干基
       DaDryBasis: null,
       //九江收货的干基
@@ -278,6 +279,91 @@ export default {
     this.options2GetRequestUrl();
   },
   methods: {
+    //excel方法
+    exportAllExcel() {
+      let startTime = null;
+      let endTime = null;
+      let carrierSsoId = null;
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (this.activeName == 'first') {
+        console.log("进入了first")
+        this.tableTitle = '销售钢材汽运结算详单(未结算)'
+        this.axios
+          .post(
+            '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&status=0" +
+            "&i=" +
+            new Date()
+          )
+          .then(res => {
+            console.log(res.data.data)
+            console.log("测试打印功能")
+            console.log()
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+      } else if (this.activeName == 'second') {
+        console.log("进入了second")
+        this.tableTitle = '销售钢材汽运结算详单(已结算)'
+        this.axios
+          .post(
+            '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+            this.ssoId
+          )
+          .then(res => {
+            this.exportAllList = res.data.data
+            console.log("测试2")
+            console.log(res)
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.settleDetailsColumn
+            )
+          })
+      }
+    },
+    //导出excel
+    exportAllReportToExcel(tableTitle, dataArr, columnData) {
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
+      console.log("进入了导出")
+      console.log(columnData)
+      columnData.forEach(e1 => {
+        if (tHeader.indexOf(e1.label) === -1) {
+          tHeader.push(e1.label)
+        }
+        if (filterVal.indexOf(e1.prop) === -1) {
+          filterVal.push(e1.prop)
+        }
+      })
+      //导出为excel
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径,使用@/+存放export2Excel的路径
+        // let list = this.$refs.excelDom.dataTabel;
+        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+    },
     //未结算数据
     options1GetRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {