提交陆运

src/components/upload/index.vue

@@ -192,7 +192,7 @@
             drag
             style="text-align: center"
             ref="upload"
-            :action="incomingAction ? incomingAction : action"
+            :action="action"
             :headers="headers"
             :on-success="onSuccess"
             multiple

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -911,7 +911,7 @@ export default {
             trigger: "blur"
           }],
         }, {
-          label: '入货场站',
+          label: '场站',
           prop: 'station',
           rules: [{
             required: true,
@@ -932,7 +932,9 @@ export default {
         }, {
           label: '备注',
           span: 24,
-          prop: 'remarks'
+          minRows: 2,
+          prop: 'remarks',
+          type: 'textarea'
         }]
       },
       goodsOptionFormTwo: {

src/views/landTransportation/dispatchingCars/index.vue

@@ -178,7 +178,7 @@ export default {
             width: 140,
             search: true,
           }, {
-            label: '入货场站',
+            label: '场站',
             prop: 'station',
             overHidden: true,
             index: 5,

src/views/landTransportation/driver/index.vue

@@ -105,21 +105,21 @@
               size="small"
               type="text"
               @click="cancelDesignate(row, index)"
-              v-if="row.status===3"
+              v-if="row.status===5"
           >取消受理
           </el-button>
           <el-button
               size="small"
               type="text"
               @click="confirmArrival(row, index)"
-              v-if="row.status === 3"
+              v-if="row.status === 5"
           >确认到厂
           </el-button>
           <el-button
               size="small"
               type="text"
               @click="confirmCompletion(row, index)"
-              v-if="row.status === 5"
+              v-if="row.status === 3"
           >确认完工
           </el-button>
           <el-button
@@ -270,7 +270,7 @@ export default {
           overHidden: true,
           prop: 'orderNo'
         }, {
-          label: '入货场站',
+          label: '场站',
           prop: 'station',
           overHidden: true,
           index: 5,
@@ -561,9 +561,9 @@ export default {
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 230
       } else {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 230
       }
       this.$refs.crud.getTableHeight()
     },

src/views/landTransportation/motorcadeDriver/index.vue

@@ -384,29 +384,12 @@ export default {
           overHidden: true,
           prop: 'orderNo'
         }, {
-          label: '入货场站',
+          label: '场站',
           prop: 'station',
           overHidden: true,
           index: 5,
           width: 140,
           search: true,
-        }, {
-          label: '车号',
-          width: 150,
-          cell: true,
-          search: true,
-          index: 6,
-          allowCreate: true,
-          prop: 'vehicleId',
-          overHidden: true,
-          filterable: true,
-          cascader: ['driverId'],
-          type: 'select',
-          dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
-          props: {
-            label: "plateNo",
-            value: "id"
-          },
         },
           {
             label: '车队',
@@ -428,6 +411,23 @@ export default {
               res: "data.records"
             },
             cell: true
+          }, {
+            label: '车号',
+            width: 150,
+            cell: true,
+            search: true,
+            index: 6,
+            allowCreate: true,
+            prop: 'vehicleId',
+            overHidden: true,
+            filterable: true,
+            cascader: ['driverId'],
+            type: 'select',
+            dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
+            props: {
+              label: "plateNo",
+              value: "id"
+            },
           },
           {
             label: '司机',
@@ -767,9 +767,9 @@ export default {
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {
-        this.entrustOptionTwoT.height = this.entrustOptionTwoT.height - 184
+        this.entrustOptionTwoT.height = this.entrustOptionTwoT.height - 230
       } else {
-        this.entrustOptionTwoT.height = this.entrustOptionTwoT.height + 184
+        this.entrustOptionTwoT.height = this.entrustOptionTwoT.height + 230
       }
       this.$refs.crud.getTableHeight()
     },
@@ -813,7 +813,7 @@ export default {
       driverQueryCollection(queryParams).then(res => {
         this.goodsList = res.data.data.records
         this.page.total = res.data.data.total
-        this.entrustOptionTwoT.height = window.innerHeight - 365;
+        this.entrustOptionTwoT.height = window.innerHeight - 355;
       }).finally(() => {
         this.loading = false;
       })

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -115,7 +115,7 @@
             <el-option
                 v-for="item in salesmanList"
                 :key="item.id"
-                :label="item.cname"
+                :label="item.realName"
                 :value="item.id">
             </el-option>
           </el-select>
@@ -306,7 +306,7 @@
           </template>
         </el-table-column>
         <el-table-column
-            property="address"
+            property="remarks"
             align="center"
             label="备注">
           <template slot-scope="scope">
@@ -938,7 +938,7 @@ export default {
             trigger: "blur"
           }],
         }, {
-          label: '入货场站',
+          label: '场站',
           prop: 'station',
           rules: [{
             required: true,
@@ -961,6 +961,7 @@ export default {
           , {
             label: '备注',
             span: 24,
+            minRows: 2,
             prop: 'remarks',
             type: 'textarea'
           }]
@@ -1810,6 +1811,8 @@ export default {
       this.tableData[scope.$index].contacts = row.attn
       this.tableData[scope.$index].tel = row.tel
       this.tableData[scope.$index].address = row.storageAddr
+      if (!scope.row.key) scope.row.key = 0
+      this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {
           this.tableData[scope.$index].region = [res.data.data.provinceCode, res.data.data.parentId, res.data.data.districtCode]

src/views/landTransportation/placeAnOrder/index.vue

@@ -245,7 +245,7 @@ export default {
             width: 140,
             search: true,
           }, {
-            label: '入货场站',
+            label: '场站',
             prop: 'station',
             overHidden: true,
             index: 5,

src/views/system/param.vue

@@ -14,15 +14,52 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot="paramValueForm">
+        <el-input placeholder="请输入内容" v-model="form.paramValue" class="input-with-select">
+          <el-button slot="append" icon="el-icon-upload" @click="excelBox = true"></el-button>
+        </el-input>
+      </template>
     </avue-crud>
+    <el-dialog
+        title="附件上传"
+        append-to-body
+        :visible.sync="excelBox"
+        width="555px"
+        :close-on-click-modal="false"
+        v-dialog-drag
+    >
+      <el-upload
+          class="upload-demo"
+          drag
+          style="text-align: center"
+          ref="upload"
+          :action="action"
+          :headers="headers"
+          :on-success="onSuccess"
+          :show-file-list="false"
+          multiple
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">
+          如上传文件过大，请耐心等待上传成功
+        </div>
+      </el-upload>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
 
+import {getToken} from "@/util/auth";
+
 export default window.$crudCommon({
   data() {
-    return {}
+    return {
+      excelBox:false,
+      action: "/api/blade-resource/oss/endpoint/put-file",
+      headers: { "Blade-Auth": "Bearer " + getToken() },
+    }
   },
   computed: {
     permissionList() {
@@ -32,9 +69,17 @@ export default window.$crudCommon({
         delBtn: this.vaildData(this.permission.param_delete, false),
         editBtn: this.vaildData(this.permission.param_edit, false)
       };
-    }
+    },
   },
-  methods: {}
+  methods: {
+    //修改上传成功
+    onSuccess(response) {
+      console.log(response)
+      this.form.paramValue = response.data.link;
+      this.excelBox = false;
+      this.$message.success("上传成功！");
+    }
+  }
 }, {
   //模块路径
   name: 'system/param',