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

src/views/finance/charge/index.vue

@@ -303,14 +303,6 @@
         prop="fBillstatus"
         width="120"
       >
-        <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus == '1'">保存</span>
-          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
-          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
-          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
-          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
-          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
-        </template>
       </el-table-column>
       <el-table-column
         label="操作"

src/views/finance/payment/index.vue

@@ -218,14 +218,14 @@
         prop="fBillstatus"
         width="120"
       >
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span v-if="scope.row.fBillstatus == '1'">保存</span>
           <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
           <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
           <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
           <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
           <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column
         label="操作"

src/views/fleet/plans/AddOrUpdate.vue

@@ -463,13 +463,13 @@
                     <el-select
                       v-model="form.goodsLossType"
                       placeholder="请选择损耗单位"
+                      :disabled="disabled"
                     >
                       <el-option
                         v-for="(dict, index) in goodsLossTypeList"
                         :key="index.dictValue"
                         :label="dict.dictLabel"
                         :value="dict.dictValue"
-                        :disabled="disabled"
                       />
                     </el-select>
                   </el-form-item>
@@ -754,7 +754,7 @@
                       @click.native.prevent="
                         revokeplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="true"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >撤销</el-button
                     >
                     <el-button
@@ -762,7 +762,7 @@
                       type="text"
                       icon="el-icon-refresh"
                       @click.native.prevent="changeplansRow(scope.row)"
-                      :disabled="scope.row.billStatus < 6"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >变更</el-button
                     >
                   </template>
@@ -1196,19 +1196,17 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opdata"
+                  prop="createTime"
                   header-align="center"
                   align="center"
                   label="上传时间"
                 >
                   <template slot-scope="scope">
                     <el-date-picker
-                      v-model="scope.row.opdata"
+                      v-model="scope.row.createTime"
                       type="datetime"
                       disabled
                       placeholder="上传时间"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="timestamp"
                     ></el-date-picker>
                   </template>
                 </el-table-column>
@@ -1529,7 +1527,7 @@ export default {
         attachUrl: null,
         attachName: null,
         createBy: this.username,
-        opdata: Date.parse(new Date()),
+        createTime: Date.parse(new Date()),
       });
     },
     //附件删除
@@ -1697,7 +1695,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("单据已进行业务调度不允许修改");
+        this.msgSuccess("单据未提交，不能进行撤销");
       }
     },
     //修改

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -746,7 +746,7 @@
                       @click.native.prevent="
                         revokeplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="scope.row.billStatus < 6"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >撤销</el-button
                     >
                     <el-button
@@ -754,7 +754,7 @@
                       type="text"
                       icon="el-icon-refresh"
                       @click.native.prevent="changeplansRow(scope.row)"
-                      :disabled="scope.row.billStatus < 6"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >变更</el-button
                     >
                   </template>
@@ -1187,19 +1187,17 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opdata"
+                  prop="createTime"
                   header-align="center"
                   align="center"
                   label="上传时间"
                 >
                   <template slot-scope="scope">
                     <el-date-picker
-                      v-model="scope.row.opdata"
+                      v-model="scope.row.createTime"
                       type="datetime"
                       placeholder="上传时间"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="timestamp"
-                      :disabled="disabled2"
+                      disabled
                     ></el-date-picker>
                   </template>
                 </el-table-column>
@@ -1518,7 +1516,7 @@ export default {
         attachUrl: null,
         attachName: null,
         createBy: this.username,
-        opdata: Date.parse(new Date()),
+        createTime: Date.parse(new Date()),
       });
     },
     //附件删除

src/views/fleet/scheduling/index.vue

@@ -374,7 +374,7 @@ import {
   exportFtmsorderbills,
 } from "@/api/fleet/ftmsorderbills";
 import { getFtmsorderbillsplans } from "@/api/fleet/ftmsorderbillsplans";
-
+import { listFtmsorderbillscntrs } from "@/api/fleet/ftmsorderbillscntrs";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { addSet, select, resetModule } from "@/api/system/set";
@@ -646,7 +646,7 @@ export default {
     getList() {
       this.loading = true;
       // this.queryParams["billStatus"]="40"
-      listFtmsorderbills(this.queryParams).then((response) => {
+      listFtmsorderbillscntrs(this.queryParams).then((response) => {
         response.rows.map((e) => {
           if (e.createTime) {
             e.createTime = e.createTime.substring(0, 10);

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -755,7 +755,7 @@
                       @click.native.prevent="
                         revokescarsRow(scope.$index, vehicleList, scope.row)
                       "
-                      :disabled="scope.row.billStatus < 6"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >撤销</el-button
                     >
                     <el-button
@@ -763,7 +763,7 @@
                       type="text"
                       icon="el-icon-document-delete"
                       @click.native.prevent="changescarsRow(scope.row)"
-                      :disabled="scope.row.billStatus < 6"
+                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
                       >变更</el-button
                     >
                   </template>
@@ -1197,19 +1197,17 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opdata"
+                  prop="createTime"
                   header-align="center"
                   align="center"
                   label="上传时间"
                 >
                   <template slot-scope="scope">
                     <el-date-picker
-                      v-model="scope.row.opdata"
+                      v-model="scope.row.createTime"
                       type="datetime"
-                      :disabled="disabled"
+                      disabled
                       placeholder="上传时间"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="timestamp"
                     ></el-date-picker>
                   </template>
                 </el-table-column>
@@ -1532,7 +1530,7 @@ export default {
         attachUrl: null,
         attachName: null,
         createBy: this.username,
-        opdata: Date.parse(new Date()),
+        createTime: Date.parse(new Date()),
       });
     },
     //附件删除
@@ -1574,6 +1572,7 @@ export default {
       tableData.push({
         cntrId: this.schedulingList[0].cntrId,
         pid: this.schedulingList[0].id,
+        carcorPid: this.schedulingList[0].carcorPid,
       });
       this.showSure(this.schedulingList);
     },

src/views/fleet/sendcar/index.vue

@@ -821,8 +821,8 @@ export default {
               e.fFeeunitid = e.fFeeunitid.toString();
             }
           });
-          this.DList = response.data.fees.filter((e) => e.fdc == "D");
-          this.CList = response.data.fees.filter((e) => e.fdc == "C");
+          this.DList = response.data.fees.filter((e) => e.fDc == "D");
+          this.CList = response.data.fees.filter((e) => e.fDc == "C");
         } else {
           this.DList = [];
           this.CList = [];

src/views/index.vue

@@ -416,8 +416,15 @@
           :More="true"
         >
           <div slot="content" style="height: 312px">
-            <div style="padding: 5px 5px 0 5px; font-size: 16px">
-              【新闻】新闻
+            <div
+              style="padding: 5px 5px 0 5px; font-size: 14px"
+              v-for="(item, index) in tableDataTwo"
+              :key="index"
+              :style="{
+                backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
+              }"
+            >
+              {{ item.noticeTitle }}
             </div>
           </div>
         </chi-card>

src/views/login.vue

@@ -52,7 +52,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2020-2022 青岛途宝软件开发有限公司</span>
+      <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号-1</a>  青岛途宝软件开发有限公司</span>
     </div>
   </div>
 </template>

src/views/track/cabinet/AddOrUpdate.vue

@@ -342,7 +342,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -384,19 +383,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="接单备注" prop="acceptRemarks">
-              <el-input
-                v-model="form.acceptRemarks"
-                placeholder="请输入接单备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
             <el-form-item label="提箱时间" prop="loadDate">
               <el-date-picker
                 clearable
@@ -411,17 +397,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="提箱备注" prop="loadRemarks">
-              <el-input
-                v-model="form.loadRemarks"
-                placeholder="请输入提箱备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="6">
             <el-form-item label="装卸货时间" prop="mdLoadDate">
               <el-date-picker
@@ -438,34 +416,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="装卸货备注" prop="mdLoadRemarks">
-              <el-input
-                v-model="form.mdLoadRemarks"
-                placeholder="请输入装卸货备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="6">
-            <el-form-item label="还柜时间" prop="unLoadDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.unLoadDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择还柜时间"
-                :disabled="true"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-        <el-row>
-          <el-col :span="6">
             <el-form-item label="还卸柜时间" prop="unLoadDate">
               <el-date-picker
                 clearable
@@ -481,17 +431,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
-              <el-input
-                v-model="form.unLoadRemarks"
-                placeholder="请输入还卸柜备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
@@ -501,16 +440,16 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择回单时间"
-                 :disabled="disabled"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="回单备注" prop="waybillRemarks">
+            <el-form-item label="备注" prop="acceptRemarks">
               <el-input
-                v-model="form.waybillRemarks"
-                placeholder="请输入回单备注"
+                v-model="form.acceptRemarks"
+                placeholder="请输入备注"
                 size="mini"
                 style="width: 180px"
                 :disabled="disabled"
@@ -557,7 +496,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="备注" prop="costRemarks">
+            <el-form-item label="花销备注" prop="costRemarks">
               <el-input
                 v-model="form.costRemarks"
                 placeholder="请输入备注"
@@ -606,7 +545,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="费用备注" prop="costomStr02">
+            <el-form-item label="垫付备注" prop="costomStr02">
               <el-input
                 v-model="form.costomStr02"
                 placeholder="请输入备注"
@@ -655,7 +594,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="费用备注" prop="costomStr01">
+            <el-form-item label="垫付备注" prop="costomStr01">
               <el-input
                 v-model="form.costomStr01"
                 placeholder="请输入备注"
@@ -668,7 +607,7 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item v-if="userType == '00'">
+        <!-- <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
               ><span
@@ -1023,7 +962,7 @@
               </el-table-column>
             </el-table>
           </div>
-        </el-collapse-item>
+        </el-collapse-item> -->
         <el-collapse-item>
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -1093,19 +1032,17 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opdata"
+                prop="createTime"
                 header-align="center"
                 align="center"
                 label="上传时间"
               >
                 <template slot-scope="scope">
                   <el-date-picker
-                    v-model="scope.row.opdata"
+                    v-model="scope.row.createTime"
                     type="date"
                     disabled
                     placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
                   ></el-date-picker>
                 </template>
               </el-table-column>
@@ -1177,13 +1114,23 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm('acceptDate')">接 单</el-button>
-      <el-button type="primary" @click="submitForm('loadDate')">提 箱</el-button>
-      <el-button type="primary" @click="submitForm('mdLoadDate')">装卸货</el-button>
-      <el-button type="primary" @click="submitForm('unLoadDate')">还卸柜</el-button>
-      <el-button type="primary" @click="submitForm('waybillDate')">回 单</el-button>
+      <el-button type="primary" @click="submitForm('acceptDate')"
+        >接 单</el-button
+      >
+      <el-button type="primary" @click="submitForm('loadDate')"
+        >提 箱</el-button
+      >
+      <el-button type="primary" @click="submitForm('mdLoadDate')"
+        >装卸货</el-button
+      >
+      <el-button type="primary" @click="submitForm('unLoadDate')"
+        >还卸柜</el-button
+      >
+      <el-button type="primary" @click="submitForm('waybillDate')"
+        >回 单</el-button
+      >
       <el-button type="success" @click="submitAllowChanges">修 改</el-button>
-      <el-button type="info" @click="submitSave">保 存</el-button>
+      <!-- <el-button type="info" @click="submitSave">保 存</el-button> -->
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
@@ -1343,7 +1290,7 @@ export default {
         attachUrl: null,
         attachName: null,
         createBy: this.username,
-        opdata: Date.parse(new Date()),
+        createTime: Date.parse(new Date()),
       });
     },
     //附件删除
@@ -1408,7 +1355,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm(butType) {
-      console.log(butType)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.DList.map((e) => {

src/views/track/cabinet/index.vue

@@ -162,6 +162,26 @@
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
+            <el-col :span="6">
+              <el-form-item
+                label-width="100px"
+                label="提箱时间"
+                prop="pickerDate"
+              >
+                <el-date-picker
+                  v-model="queryParams.pickerDate"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
       </el-collapse-transition>
@@ -210,17 +230,24 @@
         >
       </el-col>
       <el-col :span="1.5">
-          <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
+        <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-badge :value="buttonValue.acceptDate" type="warning" style="margin-right:10px">
+        <el-badge
+          :value="buttonValue.acceptDate"
+          type="warning"
+          style="margin-right: 10px"
+        >
           <el-button size="mini" @click="handleQuery('acceptDate')"
             >接 单</el-button
           >
         </el-badge></el-col
       >
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.loadDate" type="warning" style="margin-right:10px"
+        ><el-badge
+          :value="buttonValue.loadDate"
+          type="warning"
+          style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('loadDate')"
             >提 箱</el-button
           ></el-badge
@@ -228,14 +255,21 @@
       >
 
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.mdLoadDate" type="warning"  style="margin-right:10px">
+        ><el-badge
+          :value="buttonValue.mdLoadDate"
+          type="warning"
+          style="margin-right: 10px"
+        >
           <el-button size="mini" @click="handleQuery('mdLoadDate')"
             >还卸货</el-button
           ></el-badge
         >
       </el-col>
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.unLoadDate" type="warning" style="margin-right:10px"
+        ><el-badge
+          :value="buttonValue.unLoadDate"
+          type="warning"
+          style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('unLoadDate')"
             >还卸柜</el-button
           ></el-badge
@@ -437,6 +471,38 @@ export default {
   name: "plans",
   data() {
     return {
+      //时间区间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
       // 控制新增编辑弹窗的显示与隐藏
       addOrUpdateVisible: false,
       // 非单个禁用
@@ -464,6 +530,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        pickerDate:null,
       },
       showSetting: false,
       drag: false,
@@ -970,24 +1037,24 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.fees.length) {
-          this.DList = response.data.fees.filter((e) => e.fDc == "D");
-          this.CList = response.data.fees.filter((e) => e.fDc == "C");
-          response.data.fees.map((e) => {
-            if (e.fFeeunitid) {
-              e.fFeeunitid = e.fFeeunitid.toString();
-            }
-          });
-        } else {
-          this.DList = [];
-          this.CList = [];
-        }
+        // if (response.data.fees.length) {
+        //   this.DList = response.data.fees.filter((e) => e.fDc == "D");
+        //   this.CList = response.data.fees.filter((e) => e.fDc == "C");
+        //   response.data.fees.map((e) => {
+        //     if (e.fFeeunitid) {
+        //       e.fFeeunitid = e.fFeeunitid.toString();
+        //     }
+        //   });
+        // } else {
+        //   this.DList = [];
+        //   this.CList = [];
+        // }
         // if (response.data.cars.orderStatus >= 60) {
         //   this.disabled = true;
         // }
         this.title = "查看装卸柜";
         this.form = response.data.cars;
-        this.relevantAttachments = response.data.attach;
+        this.relevantAttachments = response.data.attachs;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -540,7 +540,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="srcBillNo"
+            prop="fMblno"
             header-align="center"
             align="center"
             width="140px"