新加应收费用

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/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/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 == 7">已提交</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/track/cabinet/AddOrUpdate.vue

@@ -1696,14 +1696,14 @@ export default {
           );
         }
       }
-      if (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,
@@ -1711,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,
@@ -1727,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,
           });
@@ -1815,6 +1815,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));