Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/enums/column-name.js

@@ -345,6 +345,9 @@ const columnName = [{
   code: 88.2,
   name: '陆运台账-应收'
 }, {
+  code: 88.3,
+  name: '散货台账'
+}, {
   code: 89,
   name: '事务采购申请商品明细'
 }, {

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -728,6 +728,10 @@ export default {
             label: "代理商编码",
             prop: "agentCode",
             span: 8
+          },{
+            label: "首字母",
+            prop: "initials",
+            span: 8
           },
           // {
           //   label: "总返利",

src/views/basicData/customerManagement/companyMaterial/detailsPageEdit.vue

@@ -541,6 +541,10 @@ export default {
             mock: {
               type: "county"
             }
+          },{
+            label: "首字母",
+            prop: "initials",
+            span: 8
           },
           {
             label: "备注",

src/views/basicData/customerManagement/supplierMaterial/detailsPageEdit.vue

@@ -569,7 +569,7 @@ export default {
           {
             label: "代理区域",
             prop: "belongtoarea",
-            span: 8,
+            span: 16,
             mock: {
               type: "county"
             }
@@ -578,6 +578,10 @@ export default {
             label: "信用等级",
             prop: "creditRating",
             span: 8
+          },{
+            label: "首字母",
+            prop: "initials",
+            span: 8
           },
           {
             label: "备注",

src/views/basicData/factoryInformation/factoryInformation/detailsPageEdit.vue

@@ -667,11 +667,15 @@ export default {
             label: "分管员",
             prop: "adminProfiles",
             span: 8
+          },{
+            label: "首字母",
+            prop: "initials",
+            span: 8
           },
           {
             label: "代理区域",
             prop: "belongtoarea",
-            span: 8,
+            span: 16,
             mock: {
               type: "county"
             }

src/views/basicData/fleetInformation/detailsPageEdit.vue

@@ -839,6 +839,10 @@ export default {
             label: "使用车辆数量",
             prop: "vehicleCount",
             span: 8
+          },{
+            label: "首字母",
+            prop: "initials",
+            span: 8
           },
           {
             label: "信用等级",

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -372,7 +372,7 @@
       </el-table>
     </basic-container>
     </span>
-    <trade-card title="装货地址">
+    <trade-card title="装货地点">
       <el-table
           ref="singleTable"
           border="1"
@@ -582,7 +582,7 @@
         </el-table-column>
       </el-table>
     </trade-card>
-    <trade-card title="卸货地址">
+    <trade-card title="卸货地点">
       <el-table
           border="1"
           ref="singleTable"
@@ -2647,7 +2647,7 @@ export default {
             if (valid) {
               for (let item in this.tableData) {
                 if (item < Number(this.tableData.length) - 1) {
-                  if (!this.tableData[item].corpId) return this.$message.error('请选择装货地址第' + Number(Number(item) + 1) + '行货运地点');
+                  if (!this.tableData[item].corpId) return this.$message.error('请选择装货地点第' + Number(Number(item) + 1) + '行货运地点');
                   // if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
                   // if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
                   // if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
@@ -2655,7 +2655,7 @@ export default {
               }
               for (let item in this.tableDataTwo) {
                 if (item < Number(this.tableDataTwo.length) - 1) {
-                  if (!this.tableDataTwo[item].corpId) return this.$message.error('请选择卸货地址第' + Number(Number(item) + 1) + '行货运地点');
+                  if (!this.tableDataTwo[item].corpId) return this.$message.error('请选择卸货地点第' + Number(Number(item) + 1) + '行货运地点');
                 }
               }
               this.type = true
@@ -2725,7 +2725,7 @@ export default {
         })
         for (let item in this.tableData) {
           if (item < Number(this.tableData.length) - 1) {
-            if (!this.tableData[item].corpId) return this.$message.error('请选择装货地址第' + Number(Number(item) + 1) + '行货运地点');
+            if (!this.tableData[item].corpId) return this.$message.error('请选择装货地点第' + Number(Number(item) + 1) + '行货运地点');
             // if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
             // if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
             // if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
@@ -2733,14 +2733,14 @@ export default {
         }
         for (let item in this.tableDataTwo) {
           if (item < Number(this.tableDataTwo.length) - 1) {
-            if (!this.tableDataTwo[item].corpId) return this.$message.error('请选择卸货地址第' + Number(Number(item) + 1) + '行货运地点');
+            if (!this.tableDataTwo[item].corpId) return this.$message.error('请选择卸货地点第' + Number(Number(item) + 1) + '行货运地点');
           }
         }
         if (this.tableDataTwo.length === 0) {
-          return this.$message.error('请选择卸货地址')
+          return this.$message.error('请选择卸货地点')
         }
         if (this.tableData.length === 0) {
-          return this.$message.error('请选择卸货地址')
+          return this.$message.error('请选择卸货地点')
         }
         this.$refs['goodsFormE'].validate((valid, doneE) => {
           doneE()

src/views/landTransportation/bulkCargo/index.vue

@@ -458,13 +458,13 @@ export default {
             overHidden: true,
             search: true,
           }, {
-            label: '装货地址',
+            label: '装货地点',
             prop: 'addressDetail',
             index: 6,
             width: 132,
             search: true,
           }, {
-            label: '卸货地址',
+            label: '卸货地点',
             prop: 'unloadingPlace',
             index: 7,
             width: 132,
@@ -610,13 +610,13 @@ export default {
             prop: 'dispatchNumber',
             search: true,
           }, {
-            label: '装货地址',
+            label: '装货地点',
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地址',
+            label: '卸货地点',
             prop: 'unloadingPlace',
             index: 6,
             width: 132,
@@ -773,13 +773,13 @@ export default {
             prop: 'dispatchNumber',
             search: true,
           }, {
-            label: '装货地址',
+            label: '装货地点',
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地址',
+            label: '卸货地点',
             prop: 'unloadingPlace',
             index: 6,
             width: 132,
@@ -935,13 +935,13 @@ export default {
             prop: 'dispatchNumber',
             search: true,
           }, {
-            label: '装货地址',
+            label: '装货地点',
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地址',
+            label: '卸货地点',
             prop: 'unloadingPlace',
             index: 6,
             width: 132,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -986,6 +986,7 @@ export default {
             label: "dictValue",
             value: "dictValue"
           },
+          disabled: true,
           change: (data) => {
             if (data.value === '集装箱') {
               this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = true

src/views/landTransportation/reportAnalysis/index.vue

@@ -1142,6 +1142,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         tag: '0',
+        shippingMode: '集装箱',
         ...params ? params : this.query
       }
       if (queryParams.arrivalTime) {

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -519,7 +519,7 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(140), this.optionList);
     if (this.roleName.indexOf('客户') !== -1) {
       this.bulkCargoList = this.bulkCargoListOne
-    } else if (this.roleName.indexOf('平台') !== -1) {
+    } else if (this.roleName.indexOf('平台') !== -1||this.roleName.indexOf('admin') !== -1) {
       this.bulkCargoList = this.bulkCargoListTwo
     } else if (this.roleName.indexOf('车队') !== -1) {
       this.bulkCargoList = this.bulkCargoListThree

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -177,6 +177,7 @@
         "label": "dictValue",
         "value": "dictKey"
       },
+      "slot": true,
       "overHidden": true,
       "index": 14,
       "width": 100

src/views/workManagement/main-items/detailsPage.vue

@@ -119,14 +119,14 @@
             </user-select>
             <span v-else>{{ row.userName }}</span>
           </template>
-          <template slot="frequency" slot-scope="{ row }">
-            <el-select v-if="row.$cellEdit" size="small" v-model="row.frequency" placeholder="请选择"
-              @change="frequencyChange(row)" clearable>
-              <el-option v-for="item in frequencyList" :key="item.id" :label="item.dictValue" :value="item.dictKey">
-              </el-option>
-            </el-select>
-            <span v-else>{{ row.frequency | frequencyFormat(frequencyList) }}</span>
-          </template>
+<!--          <template slot="frequency" slot-scope="{ row }">-->
+<!--            <el-select v-if="row.$cellEdit" size="small" v-model="row.frequency" placeholder="请选择"-->
+<!--              @change="frequencyChange(row)" clearable>-->
+<!--              <el-option v-for="item in frequencyList" :key="item.id" :label="item.dictValue" :value="item.dictKey">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--            <span v-else>{{ row.frequency | frequencyFormat(frequencyList) }}</span>-->
+<!--          </template>-->
           <template slot="second" slot-scope="{ row }">
             <el-select v-if="row.$cellEdit && row.frequency == 4" size="small" v-model="row.second" placeholder="请选择"
               clearable>
@@ -696,7 +696,7 @@ export default {
                 $cellEdit: true
               });
             }
-            
+
           })
 
         })
@@ -746,6 +746,10 @@ export default {
     })
     this.getWorkDicts("frequency").then(res => {
       this.frequencyList = res.data.data;
+      this.findObject(this.optionTable.column, "frequency").dicData = res.data.data
+      this.findObject(this.optionTable.column, "frequency").change = (data)=>{
+        this.frequencyChange(data.row)
+      }
     });
     this.getWorkDicts("second").then(res => {
       this.secondList = res.data.data;