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

src/views/basicdata/corps/index.vue

@@ -944,11 +944,8 @@ export default {
         updateTime: null,
         remark: null,
       };
-      this.resetForm("form");
-    },
-    // 从表重置
-    contList() {
       this.contactList = [];
+      this.resetForm("form");
     },
     // 状态修改
     handleStatusChange(row) {
@@ -976,6 +973,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.contactList = [];
       this.handleQuery();
     },
     // 多选框选中数据
@@ -988,7 +986,7 @@ export default {
     handleAdd() {
       this.reset();
       this.query();
-      this.contList();
+      this.contactList = [];
       if (Cookies.get("sysType") == 2) {
         this.form.fTypeid = [this.fTypeidOptions[0].dictValue];
         this.disCorps = true;

src/views/fleet/plans/AddOrUpdate.vue

@@ -455,6 +455,7 @@
                     size="mini"
                     @click="addRow(planList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbills:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -607,6 +608,7 @@
                         deleteplansRow(scope.$index, planList, scope.row)
                       "
                       :disabled="disabled"
+                      v-hasPermi="['fleet:ftmsorderbills:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -638,6 +640,7 @@
                     size="mini"
                     @click="addschedulingRow(schedulingList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbills:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -737,6 +740,7 @@
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
                       :disabled="scope.row.billStatus >= 6"
+                      v-hasPermi="['fleet:ftmsorderbills:edit']"
                       >删除</el-button
                     >
                     <el-button
@@ -799,6 +803,7 @@
                     size="mini"
                     @click="addDListRow(DList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbills:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -946,6 +951,7 @@
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled"
+                      v-hasPermi="['fleet:ftmsorderbills:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -977,6 +983,7 @@
                     size="mini"
                     @click="addDListRow(CList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbills:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -1124,6 +1131,7 @@
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled"
+                      v-hasPermi="['fleet:ftmsorderbills:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -1155,6 +1163,7 @@
                     size="mini"
                     @click="addRelevt"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbills:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -1252,6 +1261,7 @@
                         type="text"
                         :disabled="disabled"
                         @click="deleteFile(scope)"
+                        v-hasPermi="['fleet:ftmsorderbills:edit']"
                         >删除</el-button
                       >
                     </div>
@@ -1272,6 +1282,7 @@
                         deleteRow(scope.$index, relevantAttachments)
                       "
                       :disabled="disabled"
+                      v-hasPermi="['fleet:ftmsorderbills:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -1291,15 +1302,17 @@
         type="success"
         @click="submitAllowChanges"
         :disabled="!this.form.billStatus"
+        v-hasPermi="['fleet:ftmsorderbills:edit']"
         >修 改</el-button
       >
-      <el-button type="info" @click="submitSave" :disabled="disabled"
+      <el-button type="info" @click="submitSave" :disabled="disabled" v-hasPermi="['fleet:ftmsorderbills:edit']"
         >保 存</el-button
       >
       <el-button
         type="warning"
         @click="submitRetreat"
         :disabled="!this.form.billStatus"
+        v-hasPermi="['fleet:ftmsorderbills:edit']"
         >撤 回</el-button
       >
       <el-button @click="showDialog = false">取 消</el-button>

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -458,6 +458,7 @@
                     size="mini"
                     @click="addRow(planList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -584,6 +585,7 @@
                         deleteplansRow(scope.$index, planList, scope.row)
                       "
                       :disabled="disabled"
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -591,7 +593,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="2" v-if="userType == '00'">
+          <el-collapse-item name="2">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -615,6 +617,7 @@
                     size="mini"
                     @click="addschedulingRow(schedulingList)"
                     :disabled="disabled2"
+                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -727,6 +730,7 @@
                       :disabled="
                         scope.row.billStatus == 5 || scope.row.billStatus == 6
                       "
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >删除</el-button
                     >
                     <el-button
@@ -737,6 +741,7 @@
                       :disabled="
                         scope.row.billStatus == 3 || scope.row.billStatus == 6
                       "
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >提交</el-button
                     >
                     <el-button
@@ -749,6 +754,7 @@
                       :disabled="
                         scope.row.billStatus < 6 || !scope.row.billStatus
                       "
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >撤销</el-button
                     >
                     <el-button
@@ -759,6 +765,7 @@
                       :disabled="
                         scope.row.billStatus < 6 || !scope.row.billStatus
                       "
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >变更</el-button
                     >
                   </template>
@@ -766,7 +773,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="3" v-if="userType == '00'">
+          <el-collapse-item name="3">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -790,6 +797,7 @@
                     size="mini"
                     @click="addDListRow(DList)"
                     :disabled="disabled2"
+                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -937,6 +945,7 @@
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled2"
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -944,7 +953,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="4" v-if="userType == '00'">
+          <el-collapse-item name="4">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -968,6 +977,7 @@
                     size="mini"
                     @click="addDListRow(CList)"
                     :disabled="disabled2"
+                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -1115,6 +1125,7 @@
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled2"
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -1146,6 +1157,7 @@
                     size="mini"
                     @click="addRelevt"
                     :disabled="disabled2"
+                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -1230,6 +1242,7 @@
                           size="small"
                           type="text"
                           :disabled="disabled2"
+                          v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                           >点击上传</el-button
                         >
                       </el-upload>
@@ -1246,6 +1259,7 @@
                         type="text"
                         :disabled="disabled2"
                         @click="deleteFile(scope)"
+                        v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                         >删除</el-button
                       >
                     </div>
@@ -1266,6 +1280,7 @@
                         deleteRow(scope.$index, relevantAttachments)
                       "
                       :disabled="disabled2"
+                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
                       >删除</el-button
                     >
                   </template>
@@ -1277,17 +1292,18 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" :disabled="disabled2"
+      <el-button type="primary" @click="submitForm" :disabled="disabled2" v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
         >提 交</el-button
       >
-      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
-      <el-button type="info" @click="submitSave" :disabled="disabled2"
+      <el-button type="success" @click="submitAllowChanges" v-hasPermi="['fleet:ftmsorderbillsplans:edit']">修 改</el-button>
+      <el-button type="info" @click="submitSave" :disabled="disabled2" v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
         >保 存</el-button
       >
       <el-button
         type="warning"
         @click="submitRetreat"
         :disabled="this.form.billStatus < 6"
+        v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
         >撤 回</el-button
       >
       <el-button @click="showDialog = false">取 消</el-button>

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -539,7 +539,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-if="userType == '00'" name="2">
+          <el-collapse-item name="2">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -563,6 +563,7 @@
                     size="mini"
                     @click="addRow2(vehicleList)"
                     :disabled="disabled"
+                    v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                     >添加</el-button
                   >
                 </div>
@@ -731,6 +732,7 @@
                       :disabled="
                         scope.row.billStatus == 6 || scope.row.billStatus == 5
                       "
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >删除</el-button
                     >
                     <el-button
@@ -741,6 +743,7 @@
                       :disabled="
                         scope.row.billStatus == 6 || scope.row.billStatus == 3
                       "
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >提交</el-button
                     >
                     <el-button
@@ -753,6 +756,7 @@
                       :disabled="
                         scope.row.billStatus < 6 || !scope.row.billStatus
                       "
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >撤销</el-button
                     >
                     <el-button
@@ -763,6 +767,7 @@
                       :disabled="
                         scope.row.billStatus < 6 || !scope.row.billStatus
                       "
+                      v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >变更</el-button
                     >
                   </template>
@@ -770,7 +775,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-if="userType == '00'" name="3">
+          <el-collapse-item v-hasPermi="['fleet:ftmsorderbillscars:edit']" name="3">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -948,7 +953,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-if="userType == '00'" name="4">
+          <el-collapse-item v-hasPermi="['fleet:ftmsorderbillscars:edit']" name="4">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -1279,10 +1284,10 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="primary" @click="submitForm" :disabled="disabled" v-hasPermi="['fleet:ftmsorderbillscars:edit']">提 交</el-button>
       <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
       <!-- <el-button type="success" @click="submitAllowChanges">修 改</el-button> -->
-      <el-button type="info" @click="submitSave" :disabled="disabled">保 存</el-button>
+      <el-button type="info" @click="submitSave" :disabled="disabled" v-hasPermi="['fleet:ftmsorderbillscars:edit']">保 存</el-button>
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>

src/views/login.vue

@@ -70,8 +70,8 @@ export default {
       company_name:'建桥物流',
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

src/views/system/user/index.vue

@@ -220,7 +220,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
+<!--            <el-form-item label="邮箱" prop="email">-->
+            <el-form-item label="邮箱">
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>

src/views/track/cabinet/AddOrUpdate.vue

@@ -1058,26 +1058,26 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm('acceptDate')"
+      <el-button type="primary" @click="submitForm('acceptDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
         >接 单</el-button
       >
-      <el-button type="primary" @click="submitForm('loadDate')"
+      <el-button type="primary" @click="submitForm('loadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
         >提 箱</el-button
       >
-      <el-button type="primary" @click="submitForm('mdLoadDate')"
+      <el-button type="primary" @click="submitForm('mdLoadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
         >装卸货</el-button
       >
-      <el-button type="primary" @click="submitForm('unLoadDate')"
+      <el-button type="primary" @click="submitForm('unLoadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
         >还卸柜</el-button
       >
-      <el-button type="primary" @click="submitForm('waybillDate')"
+      <el-button type="primary" @click="submitForm('waybillDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
         >回 单</el-button
       >
-      <el-button type="primary" @click="driversubmitForm"
+      <el-button type="primary" @click="driversubmitForm" v-hasPermi="['fleet:vehicleStatus:edit']"
         >提 交</el-button
       >
-      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
-      <el-button type="info" @click="submitSave">保 存</el-button>
+      <el-button type="success" @click="submitAllowChanges" v-hasPermi="['fleet:vehicleStatus:edit']">修 改</el-button>
+      <el-button type="info" @click="submitSave" v-hasPermi="['fleet:vehicleStatus:edit']">保 存</el-button>
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
@@ -1330,7 +1330,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.oilAmt,
           fExrate: 1,
-          remarks: this.form.costRemarks,
+          remarks: null,
         });
       }
       if (this.form.driverbonus > 0) {
@@ -1346,7 +1346,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.driverbonus,
           fExrate: 1,
-          remarks: this.form.costRemarks,
+          remarks: null,
         });
       }
       if (this.form.costOth > 0) {
@@ -1362,7 +1362,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costOth,
           fExrate: 1,
-          remarks: this.form.costRemarks,
+          remarks: null,
         });
       }
       if (this.form.costomAmt03 > 0) {
@@ -1379,7 +1379,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt03,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1393,7 +1393,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt03,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           }
         );
       }
@@ -1411,7 +1411,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt04,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1425,7 +1425,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt04,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           }
         );
       }
@@ -1443,7 +1443,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt02,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1457,7 +1457,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt02,
             fExrate: 1,
-            remarks: this.form.costomStr02,
+            remarks: null,
           }
         );
       }
@@ -1475,7 +1475,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt05,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1489,7 +1489,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt05,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           }
         );
       }
@@ -1507,7 +1507,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt06,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1521,7 +1521,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt06,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           }
         );
       }
@@ -1539,7 +1539,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt01,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           },
           {
             actId: "1080",
@@ -1553,7 +1553,7 @@ export default {
             fTaxrate: 3,
             fAmount: this.form.costomAmt01,
             fExrate: 1,
-            remarks: this.form.costomStr01,
+            remarks: null,
           }
         );
       }

src/views/track/cabinet/index.vue

@@ -188,26 +188,6 @@
       </el-collapse-transition>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['fleet:plans:add']"
-          >新增</el-button
-        >
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['fleet:ftmsorderbillscars:export']"
-          >导出</el-button
-        >
-      </el-col>
       <el-col :span="1.5">
         <!--        <el-button size="mini" @click="handleQuery(null)">全 部</el-button>-->
         <el-badge
@@ -236,7 +216,7 @@
           style="margin-right: 10px"
         >
           <el-button size="mini" @click="handleQuery('acceptDate')"
-            >已接单</el-button
+            >未提箱</el-button
           >
         </el-badge></el-col
       >
@@ -246,7 +226,7 @@
           type="warning"
           style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('loadDate')"
-            >已提箱</el-button
+            >未装卸货</el-button
           ></el-badge
         ></el-col
       >
@@ -258,24 +238,16 @@
           style="margin-right: 10px"
         >
           <el-button size="mini" @click="handleQuery('mdLoadDate')"
-            >装卸货</el-button
+            >未还卸柜</el-button
           ></el-badge
         >
       </el-col>
       <el-col :span="1.5"
         ><el-badge
-          :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 :value="buttonValue.waybillDate" type="warning"
-          ><el-button size="mini" @click="handleQuery('waybillDate')"
-            >已回单</el-button
+            >已完成</el-button
           ></el-badge
         ></el-col
       >
@@ -420,15 +392,6 @@
             @click="handleUpdate(scope.row)"
             >查看</el-button
           >
-          <!-- <el-button
-            v-if="scope.row.billStatus != 6"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['fleet:plans:edit']"
-            >修改</el-button
-          > -->
         </template>
       </el-table-column>
     </el-table>