tijia

build/utils.js

@@ -29,7 +29,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "inward", "statisticalReport", "RMS"];
 // let devModules = ["index", "appoint", "inward", "TMS"];
 // let devModules = ["all"];
-let devModules = ["index", "appoint", "inward", "queue"];
+let devModules = ["index", "appoint", "inward", "queue", "statisticalReport"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

src/views/inward/components/inwardFactory/tareWeightResult.vue

@@ -3,7 +3,7 @@
   <!-- 零星物资计皮作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <span class="text">装车结束时间：</span>
+      <span class="text">计重时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -41,6 +41,8 @@ export default {
   name: "homeworkPath",
   data() {
     return {
+      endTime: null,
+      startTime: null,
       input: "",
       option: {
         // 表格请求数据的地址

src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -46,6 +46,28 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="screen1"
+            placeholder="请选择需筛选的内容"
+            clearable
+            style="width:150px"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="width:200px"
+            v-model="input1"
+            placeholder="请输入查询条件"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="exportAllReportToExcel"
             ><i class="el-icon-download"></i>Excel</el-button
@@ -98,30 +120,6 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column
-          prop="sendStation"
-          label="发站"
-          width="120px"
-          align="center"
-          column-key="sendStation"
-          :filters="[
-            { text: '专用线', value: '专用线' },
-            { text: '达州站', value: '达州站' }
-          ]"
-          :filter-method="filterSend"
-        >
-          <template slot-scope="scope">
-            <el-select size="mini" v-model="scope.row.sendStationId">
-              <el-option
-                v-for="item in sendStationList"
-                :key="item.sendStationId"
-                :label="item.sendStation"
-                :value="item.sendStationId"
-              >
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
         <el-table-column
           prop="toTheStation"
           label="到站"
@@ -203,6 +201,30 @@
           width="150px"
         >
         </el-table-column>
+        <el-table-column
+          prop="sendStation"
+          label="发站"
+          width="120px"
+          align="center"
+          column-key="sendStation"
+          :filters="[
+            { text: '专用线', value: '专用线' },
+            { text: '达州站', value: '达州站' }
+          ]"
+          :filter-method="filterSend"
+        >
+          <template slot-scope="scope">
+            <el-select size="mini" v-model="scope.row.sendStationId">
+              <el-option
+                v-for="item in sendStationList"
+                :key="item.sendStationId"
+                :label="item.sendStation"
+                :value="item.sendStationId"
+              >
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="operate"
           label="操作"
@@ -230,26 +252,46 @@ export default {
       endTime: null,
       options: [
         {
-          value: "发站",
-          lable: "发站"
+          value: "到站",
+          lable: "到站"
+        },
+        {
+          value: "收货单位",
+          lable: "收货单位"
+        },
+        {
+          value: "调入部门",
+          lable: "调入部门"
+        }
+      ],
+      options1: [
+        {
+          value: "到站",
+          lable: "到站"
         },
         {
           value: "收货单位",
           lable: "收货单位"
+        },
+        {
+          value: "调入部门",
+          lable: "调入部门"
         }
       ],
       input: null,
+      input1: null,
       tableData: [],
       screen: null,
+      screen1: null,
       //需要合并的列集合
       mergeList: [
         "saleNo",
         "saleRemark",
-        "sendStation",
-        "toTheStation",
         "receiveName",
         "index",
-        "operate"
+        "operate",
+        "transInDep",
+        "transOutDep"
       ],
       spanArr: [],
       pos: null,
@@ -364,16 +406,46 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
+      let totheStation = null;
+      let consigneeName = null;
+      let transferIndep = null;
+      let remark = null;
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
       }
+      if (this.screen == "到站") {
+        totheStation = this.input;
+      } else if (this.screen == "收货单位") {
+        consigneeName = this.input;
+      } else if (this.screen == "调入部门") {
+        transferIndep = this.input;
+      } else {
+        remark = this.input;
+      }
+      if (this.screen1 == "到站") {
+        totheStation = this.input1;
+      } else if (this.screen1 == "收货单位") {
+        consigneeName = this.input1;
+      } else if (this.screen1 == "调入部门") {
+        transferIndep = this.input1;
+      } else {
+        remark = this.input1;
+      }
       this.axios
         .post(
-          "/api/v1/oms/getKucunList?startTime=" +
+          "/api/v1/ams/getKucunList?startTime=" +
             startTime +
             "&endTime=" +
-            endTime
+            endTime +
+            "&totheStation=" +
+            totheStation +
+            "&consigneeName=" +
+            consigneeName +
+            "&transferIndep=" +
+            transferIndep +
+            "&remark=" +
+            remark
         )
         .then(res => {
           this.tableData = res.data.data;

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -92,8 +92,36 @@
         </el-table-column>
         <el-table-column
           prop="consigneeName"
-          label="收货客户"
-          width="300px"
+          label="收货单位"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="unloadPoint"
+          label="卸货地点"
+          width="200px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-autocomplete
+              class="inline-input"
+              v-model="scope.row.unloadPoint"
+              :fetch-suggestions="querySearchWarehouse"
+              placeholder="请输入卸货点名称"
+              :trigger-on-focus="false"
+              @select="handleSelectWarehouse(scope.row, scope.$index)"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.warehouseName }}</div>
+              </template>
+            </el-autocomplete>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="belongCompany"
+          label="所属公司"
+          width="200px"
           align="center"
         >
         </el-table-column>
@@ -116,6 +144,13 @@
           width="150px"
         >
         </el-table-column>
+        <el-table-column
+          prop="railwayBureau"
+          label="到局"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
         <el-table-column
           prop="capacityNum"
           label="车牌号"
@@ -158,6 +193,14 @@
           width="150px"
         >
         </el-table-column>
+        <el-table-column
+          prop="strawMats"
+          label="草垫根数"
+          align="center"
+          width="150px"
+        >
+          <template> </template>
+        </el-table-column>
         <el-table-column
           prop="orderNum"
           label="运输订单号"
@@ -171,7 +214,7 @@
           align="center"
           width="150px"
         >
-          <template slot-scope="scope" v-if="scope.row.gridId != null">
+          <template slot-scope="scope">
             <el-date-picker
               v-model="scope.row.EnStation"
               type="date"
@@ -186,7 +229,7 @@
           align="center"
           width="150px"
         >
-          <template slot-scope="scope" v-if="scope.row.gridId != null">
+          <template slot-scope="scope">
             <el-input v-model.number="scope.row.wagonNo" placeholder="发出车号">
             </el-input>
           </template>
@@ -197,7 +240,7 @@
           align="center"
           width="150px"
         >
-          <template slot-scope="scope" v-if="scope.row.gridId != null">
+          <template slot-scope="scope">
             <el-input v-model.number="scope.row.wagonWeight" placeholder="标重">
             </el-input>
           </template>
@@ -208,7 +251,7 @@
           align="center"
           width="150px"
         >
-          <template slot-scope="scope" v-if="scope.row.gridId != null">
+          <template slot-scope="scope">
             <el-input
               v-model.number="scope.row.wagonBillWeight"
               placeholder="计费吨位"
@@ -222,7 +265,7 @@
           align="center"
           width="150px"
         >
-          <template slot-scope="scope" v-if="scope.row.gridId != null">
+          <template slot-scope="scope">
             <el-date-picker
               v-model="scope.row.OutStation"
               type="date"
@@ -239,8 +282,8 @@
         >
         </el-table-column>
         <el-table-column
-          prop="wgmDelete"
-          label="状态"
+          prop="consigneeName"
+          label="客户"
           align="center"
           width="150px"
         >
@@ -294,6 +337,8 @@ export default {
     this.showSummariesPosition();
   },
   methods: {
+    //边输边查卸货点
+
     operate(row) {
       row.personnelSsoId = getCookie("userId");
       if (