修改车队 调度添加 运输性质 字段

src/views/finance/contrast/index.vue

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

src/views/fleet/scheduling/AddOrUpdate.vue

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

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -528,29 +528,37 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应收运价"
+                  label="应付运价"
                   align="center"
-                  prop="freightPriceDr"
+                  prop="freightPriceCr"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.freightPriceDr"
-                      placeholder="应收运价"
+                      v-model="scope.row.freightPriceCr"
+                      placeholder="应付运价"
                       disabled
                     />
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应付运价"
+                  label="运输性质"
                   align="center"
                   prop="freightPriceCr"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.freightPriceCr"
-                      placeholder="应付运价"
+                    <el-select
+                      v-model="scope.row.transProp"
+                      placeholder="请选择运输性质"
                       disabled
-                    />
+                      size="mini"
+                    >
+                      <el-option
+                        v-for="(dict, index) in transPropList"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                      />
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
@@ -712,19 +720,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="应收运价"
-                  align="center"
-                  prop="freightPriceDr"
-                >
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.freightPriceDr"
-                      placeholder="应收运价"
-                      disabled
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
                   label="应付运价"
                   align="center"
                   prop="freightPriceCr"

src/views/reportManagement/whgenleg/index.vue

@@ -335,7 +335,6 @@
         align="center"
         prop="fNetweightD"
         width="120" -->
-      />
       <!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
       <!-- <el-table-column
         label="出库件数"
@@ -774,6 +773,7 @@ export default {
             return res;
           }, []);
         }
+        console.log(this.getRowList)
       });
     },
     delRow() {
@@ -786,6 +786,8 @@ export default {
           this.showSetting = false;
           this.setRowList = this.tableDate;
           this.getRowList = this.tableDate;
+
+          console.log(this.getRowList)
         }
       });
     },

src/views/warehouseBusiness/outStock/index.vue

@@ -2649,7 +2649,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fOriginalbilldate"
             header-align="center"
             align="center"
             width="180px"