adsa

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
-let devModules = ["index", "statisticalReport", "appoint", "WMS"];
+let devModules = ["all"];
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 
 if (pathSrc.indexOf("node_modules") > -1) {

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:80",
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/views/appoint/components/saleContract/transportPrice.vue

@@ -10,6 +10,18 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
        <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+<!--      <el-upload
+        class="upload-excel"
+        action=""
+        :on-change="importExcel"
+        :show-file-list="false"
+        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+        :auto-upload="false"
+      >
+        <el-button type="primary">
+          导入单价表
+        </el-button>
+      </el-upload>-->
     </div>
 
 <el-tabs v-model="activeName">
@@ -23,7 +35,7 @@
           <dilTable ref="excelDom" v-bind.sync="option2" :loading="loading" :isKuang="isKuang" @func="func">
           </dilTable>
       </el-tab-pane>
-      
+
     </el-tabs>
   </div>
 </template>
@@ -66,8 +78,148 @@ export default {
     btnclick() {
       this.$router.push("/addTransportPrice");
     },
+    /*importExcel(file){
+      let that = this;
+      if (!file) {
+        that.$message({
+          message: "文件错误!",
+          type: "warning"
+        });
+        return;
+      }
+      let excelData =[]
+      var reader=new FileReader();
+      var data=null;
+      var workbook = null;
+      //设置读取操作
+      reader.onload = function (e){
+        console.log(e);
+        data = e.target.result;
+        workbook=XLSX.read(data,{type:'binary'});
+        console.log(workbook)
+        //只取第一个表的数据
+        let rows= XLSX.utils.sheet_to_json(
+          workbook.Sheets[workbook.SheetNames[0]]
+        );
+        console.log(rows)
+        let index=1;
+        // for (index=1;index<rows.length;index++){
+        //   if (
+        //     typeof workbook.Sheets[workbook.SheetNames[0]]["A"+index] !=
+        //     "undefined"
+        //   ){
+        //     index++;
+        //     break
+        //   }
+        // }
+        // console.log("表头行数:" + index);
+        // if(index>=rows.length){
+        //   that.$message({
+        //     message: "文件错误!",
+        //     type: "warning",
+        //   });
+        //   return
+        // }
+        if (
+          typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["H" + index] == 'undefined' ||
+          workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号" ||
+          workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份" ||
+          workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区" ||
+          workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇" ||
+          workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点" ||
+          workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+        ){
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号"
+          ) {
+            that.$message({
+              message: "表格格式错误:序号错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份"
+          ) {
+            that.$message({
+              message: "表格格式错误:省份错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区"
+          ) {
+            that.$message({
+              message: "表格格式错误:市/区错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇"
+          ) {
+            that.$message({
+              message: "表格格式错误:县/镇错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点"
+          ) {
+            that.$message({
+              message: "表格格式错误:卸货地点错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）"
+          ) {
+            that.$message({
+              message: "表格格式错误:参考运距（公里）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）"
+          ) {
+            that.$message({
+              message: "表格格式错误:运价（元/吨）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+          ) {
+            that.$message({
+              message: "表格格式错误:吨公里（元/吨.km）错误",
+              type: "warning"
+            });
+          }
+        }
+        //读取表格
+        for (let i = index+1; i <= rows.length+1 ; i++){
+          console.log(workbook.Sheets[workbook.SheetNames[0]]["B" + i].v)
+        }
+      }
+      reader.readAsBinaryString(file.raw);
+    }*/
   },
-  
+
 };
 </script>
 <style lang='scss' scoped>
@@ -80,4 +232,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="tableAllDate">
-    <div id="pdfDom">
+    <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
       <div class="blank"></div>
 
       <div class="title">
-        <h1 align="center">{{ shippername }}</h1>
-        <h1 align="center">物资送货单</h1>
+        <h5 align="center">{{ shippername }} 物资送货单</h5>
+        <!--        <h5 align="center">物资送货单</h5>-->
       </div>
       <div>
         <!-- tablePart0 -->
@@ -35,13 +35,12 @@
         >
           <tr>
             <th style="width: 5%; text-align: center">序号</th>
-            <th style="width: 21.5%; text-align: center">物资名称</th>
-            <th style="width: 21.5%; text-align: center">规格型号</th>
+            <th style="width: 23.5%; text-align: center">物资名称</th>
+            <th style="width: 22.5%; text-align: center">规格型号</th>
             <th style="width: 14%">件数</th>
             <th style="width: 14%">重量</th>
-            <th style="width: 19%">订单日期</th>
+            <th style="width: 21%">订单日期</th>
           </tr>
-
           <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
             <td>{{ index + 1 }}</td>
             <td>{{ item.materialName }}</td>
@@ -62,8 +61,8 @@
           class="tablePart2"
         >
           <tr>
-            <th style="width: 19.25%">收货地点</th>
-            <td style="width: 50%">
+            <th style="width: 28.5%">收货地点</th>
+            <td style="width: 71.5%">
               {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
             </td>
           </tr>
@@ -79,10 +78,10 @@
           class="tablePart3"
         >
           <tr>
-            <th style="width: 21.65%">收货人</th>
-            <td style="width: 20%">{{ consignee }}</td>
-            <th style="width: 10.5%">电话</th>
-            <td style="width: 26%">{{ consigneeTel }}</td>
+            <th style="width: 28.5%">收货人</th>
+            <td style="width: 22.5%">{{ consignee }}</td>
+            <th style="width: 14%">电话</th>
+            <td style="width: 35%">{{ consigneeTel }}</td>
           </tr>
         </table>
 
@@ -96,10 +95,10 @@
           class="tablePart4"
         >
           <tr>
-            <th style="width: 27.75%">承运商</th>
+            <th style="width: 28.5%">承运商</th>
             <td style="width: 36.5%">{{ carrierName }}</td>
-            <th style="width: 13%">车牌号</th>
-            <td style="width: 40%">{{ capacityNumber }}</td>
+            <th style="width: 14%">车牌号</th>
+            <td style="width: 35%">{{ capacityNumber }}</td>
           </tr>
         </table>
 
@@ -113,31 +112,33 @@
           class="tablePart9"
         >
           <tr>
-            <th style="width: 7.62%">备注</th>
-            <td style="width: 20%">{{ note }}</td>
+            <th style="width: 28.5%">备注</th>
+            <td style="width: 71.5%">{{ note }}</td>
           </tr>
         </table>
       </div>
 
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width: 6.25%">发货单位：</th>
-            <td style="width: 53.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">发货单位：</th>
+            <td style="width: 30.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">收货单位：</th>
+            <td style="width: 30.5%">{{ consigeeName }}</td>
           </tr>
         </table>
       </div>
 
-      <div>
-        <!-- tablePart6 -->
+      <!--          <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -151,24 +152,25 @@
             <td style="width: 53.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-      </div>
+      </div>-->
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
             <th style="width: 14.5%">签收人：</th>
+            <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
       </div>
-      <div>
-        <!-- tablePart6 -->
+      <!--      <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -181,7 +183,7 @@
             <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
-      </div>
+      </div>-->
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
@@ -233,6 +235,7 @@ export default {
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       note: ""
+      dataList:['1','2','3']
     };
   },
   created() {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -84,7 +84,7 @@
         ref="tableRef"
         border
         style="width: 100%; margin-top: 20px"
-        max-height="600px"
+        max-height="650px"
         @cell-click="cellClik"
         @row-click="rowClick"
         :row-style="{ height: '30px' }"
@@ -119,8 +119,6 @@
               :fetch-suggestions="querySearchCarrier"
               placeholder="请输入承运商"
               @select="handleSelectCarrier(scope.row, scope.$index)"
-              :disabled="scope.row.isCarrierShow != 1"
-              v-if="scope.row.isCarrierShow == 1"
             >
             </el-autocomplete>
             <el-button
@@ -145,8 +143,6 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
-              v-if="scope.row.isCarrierShow == 1"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"