提交陆运和进口

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -95,7 +95,7 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 6 && (roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1)"
+              v-if="goodsForm.status === 6 && (roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
               size="small"
               @click="cancelScheduling('3')"
           >取消受理

src/views/landTransportation/bulkCargo/index.vue

@@ -304,9 +304,9 @@
                      @click.stop="$refs.crud.rowDel(row,index)">删除
           </el-button>
         </template>
-        <template slot="corpName" slot-scope="{row,index}">
+        <template slot="corpShortName" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer"
-                @click.stop="rowCell(row,index)">{{ row.corpName }}</span>
+                @click.stop="rowCell(row,index)">{{ row.corpShortName }}</span>
         </template>
         <template slot="dispatchNumber" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer"
@@ -474,14 +474,13 @@ export default {
             width: 90,
             index: 8,
             overHidden: true,
-            prop: 'fleetName',
+            prop: 'fleetShortName',
             searchProp: 'fleetId',
             type: 'select',
             cascader: ['plateNo'],
             props: {
               label: "cname",
-              value: "id",
-              res: "data.records"
+              value: "id"
             },
             filterable: true,
             search: true,
@@ -517,7 +516,7 @@ export default {
             prop: 'remarks',
           }, {
             label: '公司名称',
-            prop: 'corpName',
+            prop: 'corpShortName',
             overHidden: true,
             index: 14,
             width: 120,
@@ -627,15 +626,14 @@ export default {
             width: 90,
             index: 7,
             overHidden: true,
-            prop: 'fleetName',
+            prop: 'fleetShortName',
             searchProp: 'fleetId',
             type: 'select',
             dicData:[],
             cascader: ['plateNo'],
             props: {
               label: "cname",
-              value: "id",
-              res: "data.records"
+              value: "id"
             },
             filterable: true,
             search: true,
@@ -682,7 +680,7 @@ export default {
             prop: 'remarks',
           }, {
             label: '公司名称',
-            prop: 'corpName',
+            prop: 'corpShortName',
             overHidden: true,
             index: 15,
             width: 120,
@@ -791,14 +789,13 @@ export default {
             width: 90,
             index: 7,
             overHidden: true,
-            prop: 'fleetName',
+            prop: 'fleetShortName',
             searchProp: 'fleetId',
             type: 'select',
             cascader: ['plateNo'],
             props: {
               label: "cname",
-              value: "id",
-              res: "data.records"
+              value: "id"
             },
             filterable: true,
             search: true,
@@ -954,15 +951,13 @@ export default {
             width: 90,
             index: 7,
             overHidden: true,
-            prop: 'fleetName',
+            prop: 'fleetShortName',
             searchProp: 'fleetId',
             type: 'select',
             cascader: ['plateNo'],
-            dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&corpType=CD",
             props: {
               label: "cname",
-              value: "id",
-              res: "data.records"
+              value: "id"
             },
             filterable: true,
             search: true,
@@ -1057,7 +1052,7 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(85.7), this.optionList);
     this.key++
     fleetList().then(res=>{
-      this.findObject(this.option.column, "fleetName").dicData = res.data.data
+      this.findObject(this.option.column, "fleetShortName").dicData = res.data.data
     })
     getSalesman().then(res=>{
       this.findObject(this.option.column, "salesmanName").dicData = res.data.data

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -23,6 +23,13 @@
         <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
+        <template slot="corpShortNameSearch" slot-scope="{ row,index}">
+          <crop-select
+              v-model="row.corpId"
+              :corpType="'KH'"
+              :label="'shortName'"
+          ></crop-select>
+        </template>
         <template slot-scope="{row}" slot="fleetId">
           <span>{{ row.fleetName }}</span>
         </template>
@@ -177,6 +184,7 @@ import {
 } from "@/api/landTransportation";
 import {getToken} from "@/util/auth";
 import {gaude} from "@/api/gaude";
+import {getSalesman} from "@/api/landTransportation/bulkCargo";
 
 export default {
   name: "index",
@@ -370,6 +378,16 @@ export default {
           prop: 'salesmanName',
           index: 3,
           width: 70,
+          searchProp: 'salesman',
+          search: true,
+          overHidden: true,
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-user/userList?roleAlias=业务员",
+          props: {
+            label: "realName",
+            value: "id"
+          }
         }, {
           label: '物流运输',
           prop: 'dispatchDept',
@@ -394,12 +412,14 @@ export default {
           width: 80,
           index: 5,
           overHidden: true,
+          search: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
           width: 90,
           index: 6,
           overHidden: true,
+          search: true,
           prop: 'contractNo'
         }, {
           label: '装货地点',
@@ -421,6 +441,15 @@ export default {
           prop: 'fleetShortName',
           index: 10,
           width: 90,
+          searchProp: 'fleetId',
+          type: 'select',
+          cascader: ['plateNo'],
+          props: {
+            label: "cname",
+            value: "id"
+          },
+          filterable: true,
+          search: true,
           overHidden: true,
         }, {
           label: '车号',
@@ -569,6 +598,16 @@ export default {
           prop: 'salesmanName',
           index: 3,
           width: 70,
+          searchProp: 'salesman',
+          search: true,
+          overHidden: true,
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-user/userList?roleAlias=业务员",
+          props: {
+            label: "realName",
+            value: "id"
+          }
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
@@ -580,12 +619,14 @@ export default {
           width: 80,
           index: 5,
           overHidden: true,
+          search: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
           width: 90,
           index: 6,
           overHidden: true,
+          search: true,
           prop: 'contractNo'
         }, {
           label: '装货地点',
@@ -607,6 +648,15 @@ export default {
           prop: 'fleetShortName',
           index: 10,
           width: 90,
+          searchProp: 'fleetId',
+          type: 'select',
+          cascader: ['plateNo'],
+          props: {
+            label: "cname",
+            value: "id"
+          },
+          filterable: true,
+          search: true,
           overHidden: true,
         }, {
           label: '车号',
@@ -791,12 +841,14 @@ export default {
           width: 80,
           index: 4,
           overHidden: true,
+          search: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
           width: 90,
           index: 5,
           overHidden: true,
+          search: true,
           prop: 'contractNo'
         }, {
           label: '装货地点',
@@ -818,6 +870,15 @@ export default {
           prop: 'fleetShortName',
           index: 9,
           width: 90,
+          searchProp: 'fleetId',
+          type: 'select',
+          cascader: ['plateNo'],
+          props: {
+            label: "cname",
+            value: "id"
+          },
+          filterable: true,
+          search: true,
           overHidden: true,
         }, {
           label: '车号',
@@ -865,6 +926,13 @@ export default {
     }
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.3), this.optionList);
     this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
+    getSalesman().then(res=>{
+      this.findObject(this.goodsOptionCrud.column, "salesmanName").dicData = res.data.data
+    })
+
+    fleetList().then(res=>{
+      this.findObject(this.option.column, "fleetShortName").dicData = res.data.data
+    })
     this.key++
     this.calculateHu()
   },

src/views/purchase/contract/detailsPage.vue

@@ -1297,6 +1297,13 @@ export default {
         this.$refs.crudContact.rowCellAdd(params)
       })
     },
+    uploadError(err, file, fileList){
+      let myError = err.toString();
+      myError= myError.replace("Error: ","")
+      myError= JSON.parse(myError);
+      this.$message.error(myError.msg)
+      this.openFullScreen(true)
+    },
     openFullScreen(res, text) {
       const loading = this.$loading({
         lock: true,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -193,7 +193,7 @@
                 :disabled="selection.length ==0|| form.status!=1 " @click="generateShipmentD">生成发货单
               </el-button>-->
               <el-button type="warning" size="small" :loading="buttonLoading"
-                          @click="generateShipmentD">生成发货单
+                          @click="generateShipmentD" :disabled="selection.length === 0">生成发货单
               </el-button>
               <!--              <el-button type="info"
                          size="small"