Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/api/fleet/ftmsorderbillscars.js

@@ -9,6 +9,15 @@ import request from '@/utils/request'
 //   })
 // }
 
+// 查询可配车列表
+export function selectStowage(query) {
+  return request({
+    url: '/fleet/ftmsorderbillscars/selectStowage',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询车队派车列表
 export function listFtmsorderbillscars(query) {
   return request({
@@ -134,7 +143,7 @@ export function selectDriverFtmsorderbillscars(data) {
     method: 'post',
     data: data
   })
-}  
+}
 
 //保存
 export function driverSaveFtmsorderbillscars(data) {
@@ -143,7 +152,7 @@ export function driverSaveFtmsorderbillscars(data) {
     method: 'post',
     data: data
   })
-}  
+}
 //提交
 export function insertDriverFtmsorderbillscars(data) {
   return request({
@@ -151,4 +160,4 @@ export function insertDriverFtmsorderbillscars(data) {
     method: 'post',
     data: data
   })
-}  
+}

src/views/finance/contrast/index.vue

@@ -1392,6 +1392,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "21",
+          label: "carLoadDate",
+          name: "提箱日期",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -717,6 +717,27 @@
                     />
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="运输性质"
+                  align="center"
+                  prop="freightPriceCr"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      v-model="scope.row.transProp"
+                      placeholder="请选择运输性质"
+                      :disabled="scope.row.disabled"
+                      size="mini"
+                    >
+                      <el-option
+                        v-for="(dict, index) in transPropList"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </template>
+                </el-table-column>
                 <el-table-column label="状态" align="center" prop="billStatus">
                   <template slot-scope="scope">
                     <span v-if="scope.row.billStatus == 1">新建</span>

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -528,29 +528,37 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应收运价"
+                  label="应付运价"
                   align="center"
-                  prop="freightPriceDr"
+                  prop="freightPriceCr"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.freightPriceDr"
-                      placeholder="应收运价"
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
                       disabled
                     />
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应付运价"
+                  label="运输性质"
                   align="center"
                   prop="freightPriceCr"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.freightPriceCr"
-                      placeholder="应付运价"
+                    <el-select
+                      v-model="scope.row.transProp"
+                      placeholder="请选择运输性质"
                       disabled
-                    />
+                      size="mini"
+                    >
+                      <el-option
+                        v-for="(dict, index) in transPropList"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                      />
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
@@ -712,19 +720,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应收运价"
-                  align="center"
-                  prop="freightPriceDr"
-                >
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.freightPriceDr"
-                      placeholder="应收运价"
-                      disabled
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
                   label="应付运价"
                   align="center"
                   prop="freightPriceCr"
@@ -817,6 +812,26 @@
                       v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >变更</el-button
                     >
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-document-delete"
+                      @click.native.prevent="selectStowage(scope.row)"
+                      v-if="schedulingList[0].transProp == '1'"
+                      :disabled="scope.row.mBillNo"
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
+                      >配载</el-button
+                    >
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-document-delete"
+                      @click.native.prevent="changescarsRow(scope.row)"
+                      v-if="schedulingList[0].transProp == '1'"
+                      :disabled="!scope.row.mBillNo"
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
+                      >撤销配载</el-button
+                    >
                   </template>
                 </el-table-column>
               </el-table>
@@ -1374,6 +1389,7 @@ import {
   changeFtmsorderbillscars,
   addFtmsorderbillscars,
   singleChangeFtmsorderbillscars,
+  selectStowage
 } from "@/api/fleet/ftmsorderbillscars";
 import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { company } from "@/api/fleet/carManage";
@@ -1500,6 +1516,8 @@ export default {
       fWbuOptions: [],
       ffeeunitidList: [],
       carManages: [],
+      stowageList: [],
+      stowageDialog: false,
       disabled2: false,
       polList: [],
       podList: [],
@@ -1845,7 +1863,6 @@ export default {
       //   }
       // });
     },
-
     //单条订单调度提交
     addscarsRow(row) {
       if (row.billStatus == 5) {
@@ -1923,6 +1940,15 @@ export default {
         this.$message.error("此条数据没有提交，不能申请撤回");
       }
     },
+    // 查询可配载数据
+    selectStowage(row) {
+      selectStowage(row).then((response) => {
+        this.stowageDialog = true;
+        if (response.rows) {
+          this.stowageList = response.rows;
+        }
+      });
+    },
     changescarsRow(row) {
       if (row.billStatus == 6) {
         changeFtmsorderbillscars(row.id).then((response) => {

src/views/reportManagement/whgenleg/index.vue

@@ -335,7 +335,6 @@
         align="center"
         prop="fNetweightD"
         width="120" -->
-      />
       <!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
       <!-- <el-table-column
         label="出库件数"
@@ -596,7 +595,7 @@ export default {
         },
         {
           surface: "2",
-          label: "fReviewDate",
+          label: "fOriginalbilldate",
           name: "入库日期",
           checked: 0,
           width: 100,
@@ -774,6 +773,7 @@ export default {
             return res;
           }, []);
         }
+        console.log(this.getRowList)
       });
     },
     delRow() {
@@ -786,6 +786,8 @@ export default {
           this.showSetting = false;
           this.setRowList = this.tableDate;
           this.getRowList = this.tableDate;
+
+          console.log(this.getRowList)
         }
       });
     },

src/views/track/cabinet/index.vue

@@ -244,9 +244,19 @@
       </el-col>
       <el-col :span="1.5"
         ><el-badge
-          type="warning"
+        :value="buttonValue.unLoadDate"
+        type="warning"
           style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('unLoadDate')"
+            >未回单</el-button
+          ></el-badge
+        ></el-col
+      >
+      <el-col :span="1.5"
+        ><el-badge
+          type="warning"
+          style="margin-right: 10px"
+          ><el-button size="mini" @click="handleQuery('receiptDate')"
             >已完成</el-button
           ></el-badge
         ></el-col

src/views/warehouseBusiness/inStock/index.vue

@@ -6625,7 +6625,7 @@ export default {
               "tWarehousebillsfeesDr",
               JSON.stringify(this.warehouseDrList)
             );
-            formData.append("mblnoStatus", this.mblnoStatus);
+            formDatae.append("mblnoStatus", this.mblnoStatus);
             addWarehousebills(formDatae).then((response) => {
               this.form = response.data.warehouseBills;
               this.$set(this.form, "fEta", Date.parse(this.form.fEta));

src/views/warehouseBusiness/outStock/index.vue

@@ -2649,7 +2649,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fOriginalbilldate"
             header-align="center"
             align="center"
             width="180px"
@@ -6311,7 +6311,6 @@ export default {
             "warehousebillsfeesDr",
             JSON.stringify(this.warehouseDrList)
           );
-
           addWhgenleg(formData).then((response) => {
             this.fid = response.data.fPid;
             // 暂时注释掉，后续可能会加回来 仓储费得出的明细
@@ -6483,6 +6482,7 @@ export default {
                     "warehousebillsfeesDr",
                     JSON.stringify(this.warehouseDrList)
                   );
+                  formData.append("mblnoStatus", this.mblnoStatus);
                   addWarehousebills(formData).then((response) => {
                     this.form = response.data.warehouseBills;
                     this.$set(