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

src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import logoImg from "@/assets/logo/logo2.png";
+import logoImg from "@/assets/logo/logo.png";
 import variables from "@/assets/styles/variables.scss";
 
 export default {

src/views/fleet/plans/AddOrUpdate.vue

@@ -715,6 +715,32 @@
                     />
                   </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"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
+                      :disabled="scope.row.billStatus >= 6"
+                    />
+                  </template>
+                </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
@@ -1305,7 +1331,11 @@
         v-hasPermi="['fleet:ftmsorderbills:edit']"
         >修 改</el-button
       >
-      <el-button type="info" @click="submitSave" :disabled="disabled" v-hasPermi="['fleet:ftmsorderbills:edit']"
+      <el-button
+        type="info"
+        @click="submitSave"
+        :disabled="disabled"
+        v-hasPermi="['fleet:ftmsorderbills:edit']"
         >保 存</el-button
       >
       <el-button
@@ -1529,6 +1559,8 @@ export default {
       let arr = this.planList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
       row["pid"] = arr2[0].id;
+      row["freightPriceCr"] = arr2[0].priceCr;
+      row["freightPriceDr"] = arr2[0].priceDr;
     },
     noMorecntrId(e) {
       this.cntrIdList.forEach((item) => (item.noOption = false));

src/views/fleet/plans/index.vue

@@ -470,34 +470,41 @@ export default {
         },
         {
           surface: "2",
+          label: "billNo",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
           label: "createTime",
           name: "制单日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "loadDate",
           name: "提箱日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "billType",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "transType",
           name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "transProp",
           name: "运输性质",
           checked: 0,

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -691,6 +691,32 @@
                     />
                   </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"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
+                      :disabled="scope.row.disabled"
+                    />
+                  </template>
+                </el-table-column>
                 <el-table-column label="状态" align="center" prop="billStatus">
                   <template slot-scope="scope">
                     <span v-if="scope.row.billStatus == 1">新建</span>
@@ -1292,11 +1318,24 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" :disabled="disabled2" v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :disabled="disabled2"
+        v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
         >提 交</el-button
       >
-      <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
+        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
@@ -1513,7 +1552,10 @@ export default {
     checkPid(row) {
       let arr = this.planList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
+      console.log(arr2);
       row["pid"] = arr2[0].id;
+      row["freightPriceCr"] = arr2[0].priceCr;
+      row["freightPriceDr"] = arr2[0].priceDr;
     },
     noMorecntrId(e) {
       this.cntrIdList.forEach((item) => (item.noOption = false));

src/views/fleet/scheduling/index.vue

@@ -307,7 +307,7 @@
         fixed="left"
       >
         <template slot-scope="scope">
-            <el-link :underline="false" type="primary"
+          <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link
@@ -447,34 +447,41 @@ export default {
         },
         {
           surface: "2",
+          label: "billNo",
+          name: "系统编号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
           label: "createTime",
           name: "制单日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "loadDate",
           name: "提箱日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "billType",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "transType",
           name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "transProp",
           name: "运输性质",
           checked: 0,

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -527,6 +527,32 @@
                     />
                   </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"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
+                      disabled
+                    />
+                  </template>
+                </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
@@ -583,7 +609,7 @@
                       @change="checkPid(scope.row)"
                     >
                       <el-option
-                        v-for="(dict, index) in cntrId2List"
+                        v-for="(dict, index) in cntrIdList"
                         :key="index.dictValue"
                         :label="dict.dictLabel"
                         :value="dict.dictValue"
@@ -604,7 +630,7 @@
                       v-input-limit="0"
                       placeholder="货量"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                     />
                   </template>
@@ -621,7 +647,7 @@
                       v-model="scope.row.cntrNo"
                       placeholder="箱号"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                     />
                   </template>
@@ -633,16 +659,11 @@
                   width="130"
                 >
                   <template slot-scope="scope">
-                    <!-- <el-input
-                      v-model="scope.row.carregNo"
-                      placeholder="车号"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
-                    /> -->
                     <el-select
                       v-model="scope.row.carregNo"
                       placeholder="车号"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                       :clearable="true"
                       filterable
@@ -668,7 +689,7 @@
                       v-model="scope.row.driverName"
                       placeholder="司机姓名"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                     />
                   </template>
@@ -685,18 +706,44 @@
                       placeholder="联系电话"
                       v-input-limit="2"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                     />
                   </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"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
+                      disabled
+                    />
+                  </template>
+                </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                     />
                   </template>
@@ -711,7 +758,7 @@
                   <template slot-scope="scope">
                     <div v-if="scope.row.billStatus == 2">已暂存</div>
                     <div v-if="scope.row.billStatus == 3">已撤销</div>
-                    <div v-if="scope.row.billStatus == 6">已提交</div>
+                    <div v-if="scope.row.billStatus >= 6">已提交</div>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -741,7 +788,7 @@
                       icon="el-icon-document-checked"
                       @click.native.prevent="addscarsRow(scope.row)"
                       :disabled="
-                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                        scope.row.billStatus >= 6 || scope.row.billStatus == 3
                       "
                       v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >提交</el-button
@@ -775,7 +822,10 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-hasPermi="['fleet:ftmsorderbillscars:edit']" 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
@@ -953,7 +1003,10 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-hasPermi="['fleet:ftmsorderbillscars:edit']" 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
@@ -1284,10 +1337,22 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" :disabled="disabled" v-hasPermi="['fleet:ftmsorderbillscars:edit']">提 交</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" v-hasPermi="['fleet:ftmsorderbillscars:edit']">保 存</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>
@@ -1431,7 +1496,6 @@ export default {
       userType: null,
       username: null,
       fMblnoOptions: [],
-      cntrId2List: [],
       goodsOptions: [],
       fWbuOptions: [],
       ffeeunitidList: [],
@@ -1576,6 +1640,8 @@ export default {
         cntrId: this.schedulingList[0].cntrId,
         pid: this.schedulingList[0].id,
         carcorPid: this.schedulingList[0].carcorPid,
+        freightPriceDr: this.schedulingList[0].freightPriceDr,
+        freightPriceCr: this.schedulingList[0].freightPriceCr,
       });
       this.showSure(this.schedulingList);
       listFtmsorderbillss({
@@ -1624,7 +1690,7 @@ export default {
           if (!this.vehicleList.length) {
             return this.$message.error("车辆安排不能为空");
           }
-          if(this.schedulingList[0].cntrQty!=this.schedulingList[0].carQty){
+          if (this.schedulingList[0].cntrQty != this.schedulingList[0].carQty) {
             return this.$message.error("调度安排存在未安排的货量");
           }
           this.DList.map((e) => {

src/views/reportManagement/outExcel/index.vue

@@ -122,7 +122,6 @@ export default {
   components: {},
   data() {
     return {
-      stockDate: [],
       // 遮罩层
       loading: true,
       queryParams: {
@@ -348,4 +347,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/track/cabinet/AddOrUpdate.vue

@@ -372,7 +372,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -384,7 +384,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -398,7 +398,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择接单时间"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               >
               </el-date-picker>
             </el-form-item>
@@ -416,7 +416,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择提箱时间"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               >
               </el-date-picker>
             </el-form-item>
@@ -431,7 +431,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择装卸货时间"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               >
               </el-date-picker>
             </el-form-item>
@@ -446,7 +446,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择还卸柜时间"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               >
               </el-date-picker>
             </el-form-item>
@@ -461,7 +461,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择回单时间"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               >
               </el-date-picker>
             </el-form-item>
@@ -477,7 +477,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -489,7 +489,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -501,7 +501,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -512,7 +512,7 @@
                 placeholder="请输入备注"
                 size="mini"
                 style="width: 180px"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -526,7 +526,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -538,7 +538,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -550,7 +550,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -561,7 +561,7 @@
                 placeholder="请输入备注"
                 size="mini"
                 style="width: 180px"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -575,7 +575,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -587,7 +587,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -599,7 +599,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -610,7 +610,7 @@
                 placeholder="请输入备注"
                 size="mini"
                 style="width: 180px"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
               />
             </el-form-item>
           </el-col>
@@ -622,7 +622,7 @@
                 v-model="form.acceptRemarks"
                 placeholder="请输入备注"
                 size="mini"
-                :disabled="disabled"
+                :disabled="disabled||form.billStatus == 7"
                 type="textarea"
                 :rows="2"
               />
@@ -654,6 +654,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="addRelevt4"
+                  :disabled="form.billStatus == 7"
                   v-hasPermi="['fleet:vehicleStatus:edit']"
                   >添加费用</el-button
                 >
@@ -662,6 +663,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="addRelevt2"
+                  :disabled="form.billStatus == 7"
                   v-hasPermi="['fleet:vehicleStatus:edit']"
                   >导入费用</el-button
                 >
@@ -684,7 +686,7 @@
                   size="mini"
                   style="width: 160px"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                 >
                   <el-option
@@ -709,7 +711,7 @@
                   remote
                   placeholder="费用名称"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                 >
                   <el-option
@@ -727,7 +729,7 @@
                   v-model="scope.row.fDc"
                   placeholder="请选择"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                 >
                   <el-option label="收" value="D"></el-option>
@@ -746,7 +748,7 @@
                   v-model="scope.row.fFeeunitid"
                   placeholder="请选择计费单位"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   clearable
                 >
@@ -770,7 +772,7 @@
                   v-model="scope.row.fBillingQty"
                   placeholder="请输入内容"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   @input="total(scope.row)"
                   v-input-limit="2"
@@ -788,7 +790,7 @@
                   v-model="scope.row.fUnitprice"
                   placeholder="请输入内容"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   @input="total(scope.row)"
                   v-input-limit="2"
@@ -805,7 +807,7 @@
                 <el-input
                   v-model="scope.row.fCurrency"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   placeholder="请输入内容"
                 ></el-input>
@@ -821,7 +823,7 @@
                 <el-input
                   v-model="scope.row.fExrate"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   placeholder="请输入内容"
                 ></el-input>
@@ -837,7 +839,7 @@
                 <el-input
                   v-model="scope.row.fAmount"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   placeholder="请输入内容"
                 ></el-input>
@@ -853,7 +855,7 @@
                 <el-input
                   v-model="scope.row.fTaxrate"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                   placeholder="请输入内容"
                 ></el-input>
@@ -870,7 +872,7 @@
                   v-model="scope.row.remarks"
                   placeholder="请输入内容"
                   :disabled="
-                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
                   "
                 ></el-input>
               </template>
@@ -894,7 +896,7 @@
                   type="text"
                   icon="el-icon-document-checked"
                   :disabled="
-                    scope.row.fBillstatus == 6 || scope.row.fBillstatus == 3
+                    scope.row.fBillstatus == 6 || scope.row.fBillstatus == 3||form.billStatus == 7
                   "
                   @click.native.prevent="addFees(scope.row)"
                   >提交</el-button
@@ -903,7 +905,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-refresh"
-                  :disabled="scope.row.fBillstatus == 3"
+                  :disabled="scope.row.fBillstatus == 3||form.billStatus == 7"
                   @click.native.prevent="fixFees(scope.row)"
                   >变更</el-button
                 >
@@ -911,7 +913,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-document-delete"
-                  :disabled="scope.row.fBillstatus < 6"
+                  :disabled="scope.row.fBillstatus < 6||form.billStatus == 7"
                   @click.native.prevent="revokeFees(scope.row)"
                   >撤销</el-button
                 >
@@ -919,7 +921,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
-                  :disabled="scope.row.fBillstatus == 6"
+                  :disabled="scope.row.fBillstatus == 6||form.billStatus == 7"
                   @click.native.prevent="
                     delFees(scope.$index, chiFeesList, scope.row)
                   "
@@ -952,7 +954,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="addRelevt"
-                  :disabled="disabled"
+                  :disabled="disabled||form.billStatus == 7"
                   >添加</el-button
                 >
               </div>
@@ -978,7 +980,7 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
-                    :disabled="disabled"
+                    :disabled="disabled||form.billStatus == 7"
                   />
                 </template>
               </el-table-column>
@@ -993,7 +995,7 @@
                     v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
-                    :disabled="disabled"
+                    :disabled="disabled||form.billStatus == 7"
                   />
                 </template>
               </el-table-column>
@@ -1029,11 +1031,11 @@
                         }
                       "
                       :headers="headers"
-                      :disabled="disabled"
+                      :disabled="disabled||form.billStatus == 7"
                       :show-file-list="false"
                       :limit="1"
                     >
-                      <el-button size="small" type="text" :disabled="disabled"
+                      <el-button size="small" type="text" :disabled="disabled||form.billStatus == 7"
                         >点击上传</el-button
                       >
                     </el-upload>
@@ -1041,14 +1043,14 @@
                       size="small"
                       type="text"
                       @click="checkFile(scope)"
-                      :disabled="disabled"
+                      :disabled="disabled||form.billStatus == 7"
                       style="margin-left: 10px"
                       >查看</el-button
                     >
                     <el-button
                       size="small"
                       type="text"
-                      :disabled="disabled"
+                      :disabled="disabled||form.billStatus == 7"
                       @click="deleteFile(scope)"
                       >删除</el-button
                     >
@@ -1069,7 +1071,7 @@
                     @click.native.prevent="
                       deleteRow(scope.$index, relevantAttachments)
                     "
-                    :disabled="disabled"
+                    :disabled="disabled||form.billStatus == 7"
                     >删除</el-button
                   >
                 </template>
@@ -1084,48 +1086,56 @@
         type="primary"
         @click="submitForm('acceptDate')"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >接 单</el-button
       >
       <el-button
         type="primary"
         @click="submitForm('loadDate')"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >提 箱</el-button
       >
       <el-button
         type="primary"
         @click="submitForm('mdLoadDate')"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >装卸货</el-button
       >
       <el-button
         type="primary"
         @click="submitForm('unLoadDate')"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >还卸柜</el-button
       >
       <el-button
         type="primary"
         @click="submitForm('waybillDate')"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >回 单</el-button
       >
       <el-button
         type="primary"
         @click="driversubmitForm"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >提 交</el-button
       >
       <el-button
         type="success"
         @click="submitAllowChanges"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >修 改</el-button
       >
       <el-button
         type="info"
         @click="submitSave"
         v-hasPermi="['fleet:vehicleStatus:edit']"
+        :disabled="form.billStatus == 7"
         >保 存</el-button
       >
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
@@ -1686,14 +1696,14 @@ export default {
           );
         }
       }
-      if (this.form.priceDr > 0 || this.form.priceCr > 0) {
+      if (this.form.freightPriceCr > 0||this.form.freightPriceDr > 0) {
         this.fFeeid61 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 61 && e.actId == 1080) {
             this.fFeeid61 = false;
           }
         });
-        if (this.fFeeid61 && this.form.priceDr > 0) {
+        if (this.fFeeid61&& this.form.freightPriceDr> 0) {
           this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1701,15 +1711,15 @@ export default {
             fDc: "D",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.priceDr,
+            fUnitprice: this.form.freightPriceDr,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.priceDr,
+            fAmount: this.form.freightPriceDr,
             fExrate: 1,
             remarks: null,
           });
         }
-        if (this.fFeeid61 && this.form.priceCr > 0) {
+        if (this.fFeeid61 && this.form.freightPriceCr > 0) {
           this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.carcorPid,
@@ -1717,10 +1727,10 @@ export default {
             fDc: "C",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.priceCr,
+            fUnitprice: this.form.freightPriceCr,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.priceCr,
+            fAmount: this.form.freightPriceCr,
             fExrate: 1,
             remarks: null,
           });
@@ -1761,6 +1771,7 @@ export default {
           formData.append("operationType", butType);
           insertDriverFtmsorderbillscars(formData).then((response) => {
             if (response.code == 200) {
+              this.$set(this.form, "orderStatus", response.data.orderStatus);
               this.msgSuccess("提交成功");
               this.$parent.getList();
             }
@@ -1805,6 +1816,9 @@ export default {
       if (this.chiFeesList.length == 0) {
         return this.$message.error("确认费用不能为空");
       }
+      if(this.form.orderStatus<60){
+         return this.$message.error("该运单未回单，请先回单");
+      }
       let formData = new window.FormData();
       formData.append("cars", JSON.stringify(this.form));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));

src/views/warehouseBusiness/inStock/index.vue

@@ -2458,7 +2458,7 @@
                   disabled
                 >
                   <el-option
-                    v-for="(dic, index) in businessTypeOption"
+                    v-for="(dict, index) in businessTypeOption"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
@@ -2560,7 +2560,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="(dic, index) in fStltypeOptions"
+                    v-for="(dict, index) in fStltypeOptions"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -4297,7 +4297,6 @@ export default {
         fSbu: [{ required: true, message: " ", trigger: "blur" }],
         fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
         fStorekeeper: { required: true, message: " ", trigger: "blur" },
-        // fleet:[{required: this.isrequired == '1' ? true : false,message: " ", trigger: "blur"}],
         fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fbillingway: [{ required: true, message: " ", trigger: "blur" }],
         fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
@@ -6626,6 +6625,7 @@ export default {
               "tWarehousebillsfeesDr",
               JSON.stringify(this.warehouseDrList)
             );
+            formData.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/stockTransfer/index.vue

@@ -6039,6 +6039,7 @@ export default {
                     "warehousebillsfeesDr",
                     JSON.stringify(this.warehouseDrList)
                   );
+                  formData.append("mblnoStatus", this.mblnoStatus);
                   addStockTransfer(formData).then((response) => {
                     this.form = response.data.warehouseBills;
                     this.$set(this.form, "fEta", Date.parse(this.form.fEta));
@@ -6177,6 +6178,7 @@ export default {
       }
       let formData = new window.FormData();
       let withdrawList = JSON.parse(JSON.stringify(this.dataWithdrawList));
+      formData.append("type", "1");
       formData.append("warehouseBills", JSON.stringify(this.form));
       formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
       formData.append(