Merge remote-tracking branch 'origin/dev' into dev

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2366,7 +2366,7 @@ export default {
           delete res.data.data.fudaPurchaseStatus;
           delete res.data.data.documentaryStatus;
           res.data.data.orderStatus = "录入";
-          res.data.data.cargoType = "普货",
+          // res.data.data.cargoType = "普货",
             res.data.data.orderItemsList.forEach(e => {
               delete e.id;
               delete e.pid;

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -34,7 +34,7 @@
           </el-button>
           <el-button type="success" v-if="goodsForm.status === 0 && typeTwo === false"
             v-show="roleName.indexOf('admin') !== -1 || roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
-            size="small" :loading="type" @click="submit(true)">{{$t("landbtn118n.submit")}}
+            size="small" :loading="type" @click="submit(true)">{{ $t("landbtn118n.submit") }}
           </el-button>
           <el-button type="success" v-if="goodsForm.status > 0 && goodsForm.status !== 5" size="small" :loading="type"
             v-show="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1 && goodsForm.status === 1 || goodsForm.status === 2)
@@ -44,25 +44,27 @@
               || (roleName.indexOf('司机') !== -1 && goodsForm.status === 6) || roleName.indexOf('admin') !== -1"
             @click="modifyState">
             {{
-              goodsForm.status === 1 ? $t('landbtn118n.dispatch') : goodsForm.status === 2 ? $t('landbtn118n.dispatchVehicle') : goodsForm.status === 3 ? $t('landbtn118n.acceptance') :
-                goodsForm.status === 4 ? $t('landbtn118n.confirmCompletion') : goodsForm.status === 6 ? $t('landbtn118n.confirmFactory') : $t('landbtn118n.unknownState') + goodsForm.status
+              goodsForm.status === 1 ? $t('landbtn118n.dispatch') : goodsForm.status === 2 ?
+                $t('landbtn118n.dispatchVehicle') : goodsForm.status === 3 ? $t('landbtn118n.acceptance') :
+                  goodsForm.status === 4 ? $t('landbtn118n.confirmCompletion') : goodsForm.status === 6 ?
+                    $t('landbtn118n.confirmFactory') : $t('landbtn118n.unknownState') + goodsForm.status
             }}
           </el-button>
           <el-button type="warning"
             v-if="goodsForm.status === 2 && ((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1)"
-            size="small" :loading="type" @click="cancelScheduling('2')">{{$t("landbtn118n.cancelScheduling")}}
+            size="small" :loading="type" @click="cancelScheduling('2')">{{ $t("landbtn118n.cancelScheduling") }}
           </el-button>
           <el-button type="warning"
             v-if="goodsForm.status === 3 && ((roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
-            size="small" :loading="type" @click="cancelScheduling('1')">{{$t("landbtn118n.cancelDispatch")}}
+            size="small" :loading="type" @click="cancelScheduling('1')">{{ $t("landbtn118n.cancelDispatch") }}
           </el-button>
           <el-button type="warning"
             v-if="goodsForm.status === 6 && ((roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
-            size="small" :loading="type" @click="cancelScheduling('3')">{{$t("landbtn118n.cancelAcceptance")}}
+            size="small" :loading="type" @click="cancelScheduling('3')">{{ $t("landbtn118n.cancelAcceptance") }}
           </el-button>
           <el-button type="success"
             v-if="goodsForm.status === 1 && ((roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
-            size="small" :loading="type" @click="submit(false)">{{$t("landbtn118n.revoke")}}
+            size="small" :loading="type" @click="submit(false)">{{ $t("landbtn118n.revoke") }}
           </el-button>
           <el-button type="primary" :disabled="goodsForm.status === 5"
             v-show="(roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1) || roleName.indexOf('分管调度') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('车队') !== -1 && this.goodsForm.status > 3 && goodsForm.status !== 5)"
@@ -549,7 +551,7 @@
             v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
             @click="$refs.collection.rowDel(row, index)">
             <!-- 删除 -->
-             {{ $t("landbtn118n.deleted")  }}
+            {{ $t("landbtn118n.deleted") }}
           </el-button>
           <el-button size="small" type="text" icon="el-icon-s-order" @click="annexOpen(row, index)">
             <!-- 附 件 -->
@@ -592,7 +594,7 @@
             v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
             @click="$refs.payment.rowDel(row, index)">
             <!-- 删除 -->
-             {{ $t("landbtn118n.deleted")  }}
+            {{ $t("landbtn118n.deleted") }}
           </el-button>
           <el-button size="small" type="text" icon="el-icon-s-order" @click="annexOpen(row, index)">
             <!-- 附 件 -->
@@ -1686,24 +1688,23 @@ export default {
           // label: '客户名称',
           label: this.$t("land118n.corpShortName"),
           slot: true,
-          width: 300,
-          prop: 'corpId'
+          width: 200,
+          overHidden: true,
+          prop: 'corpId',
+          index: 1
         }, {
           // label: '车号',
           label: this.$t("land118n.vehicleNumber"),
-          cell: true,
           prop: 'plateNo',
-          type: "select",
-          props: {
-            label: "label",
-            value: "label"
-          },
+          width: 100,
+          index: 2
         }, {
           // label: '费用名称',
           label: this.$t("land118n.cost"),
           slot: true,
           width: 200,
-          prop: 'feeId'
+          prop: 'feeId',
+          index: 3,
         }, {
           // label: '计价单位',
           label: this.$t("land118n.unitNo"),
@@ -1714,33 +1715,32 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          index: 4,
         }, {
           // label: '单价',
           label: this.$t("land118n.price"),
           cell: true,
-          type: 'number',
-          controls: false,
-          prop: 'price'
+          prop: 'price',
+          index: 5
         }, {
           // label: '数量',
           label: this.$t("land118n.quantity"),
           cell: true,
-          controls: false,
-          type: 'number',
-          prop: 'quantity'
+          prop: 'quantity',
+          index: 6
         }, {
           // label: '金额',
           label: this.$t("land118n.amount"),
           cell: true,
-          type: 'number',
-          controls: false,
-          prop: 'amount'
+          prop: 'amount',
+          index: 7
         }, {
           // label: '税率',
           label: this.$t("land118n.taxRate"),
           cell: true,
-          prop: 'taxRate'
+          prop: 'taxRate',
+          index: 8
         }, {
           // label: '币别',
           label: this.$t("land118n.currency"),
@@ -1752,20 +1752,19 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
+          index: 9
         },
         {
           // label: '结算金额',
           label: this.$t("land118n.settlementAmount"),
-          prop: 'settlementAmount',
+          type: 'settlementAmount',
+          index:10
         },
         {
           // label: '结算时间',
           label: this.$t("land118n.settlementTime"),
-          prop: 'settlementDate',
-          type: "date",
-          width: 100,
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd",
+          type: 'settlementDate',
+          index: 11
         }]
       },
       paymentList: [],
@@ -1802,29 +1801,33 @@ export default {
         }],
         column: [{
           // label: '客户名称',
-          label: this.$t("land118n.corpShortName"),
-          slot: true,
+          label: this.$t("land118n.corpName"),
+          cell: true,
           width: 300,
-          prop: 'corpId'
+          prop: 'fleetId',
+          type: "select",
+          index: 1,
+          props: {
+            label: "fleetName",
+            value: "fleetId"
+          }
         }, {
           // label: '车号',
           label: this.$t("land118n.vehicleNumber"),
-          cell: true,
           prop: 'plateNo',
-          type: "select",
-          props: {
-            label: "label",
-            value: "label"
-          },
+          width: 100,
+          index: 2
         }, {
           // label: '费用名称',
           label: this.$t("land118n.cost"),
           slot: true,
           width: 200,
-          prop: 'feeId'
+          prop: 'feeId',
+          index: 3
         }, {
           // label: '计价单位',
           label: this.$t("land118n.unitNo"),
+          width: 100,
           cell: true,
           prop: 'unit',
           type: "select",
@@ -1832,33 +1835,33 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
-        }, {
-          // label: '单价',
-          label: this.$t("land118n.price"),
-          cell: true,
-          type: 'number',
-          controls: false,
-          prop: 'price'
+          },
+          index: 4
         }, {
           // label: '数量',
           label: this.$t("land118n.quantity"),
           cell: true,
-          controls: false,
-          type: 'number',
-          prop: 'quantity'
+          prop: 'quantity',
+          index: 5
+        }, {
+          // label: '单价',
+          label: this.$t("land118n.price"),
+          cell: true,
+          prop: 'price',
+          index: 6
         }, {
           // label: '金额',
           label: this.$t("land118n.amount"),
           cell: true,
-          type: 'number',
-          controls: false,
-          prop: 'amount'
+          prop: 'amount',
+          index: 7
         }, {
+          // label: '税率(默认6)',
           // label: '税率',
           label: this.$t("land118n.taxRate"),
           cell: true,
-          prop: 'taxRate'
+          prop: 'taxRate',
+          index: 8
         }, {
           // label: '币别',
           label: this.$t("land118n.currency"),
@@ -1870,20 +1873,19 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
+          index: 9
         },
         {
           // label: '结算金额',
           label: this.$t("land118n.settlementAmount"),
-          prop: 'settlementAmount',
+          type: 'settlementAmount',
+          index: 10
         },
         {
           // label: '结算时间',
           label: this.$t("land118n.settlementTime"),
-          prop: 'settlementDate',
-          type: "date",
-          width: 100,
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd",
+          type: 'settlementDate',
+          index: 11
         }]
       }
     };
@@ -1953,6 +1955,7 @@ export default {
           this.goodsForm = res.data.data
           this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.goodsForm.id
           this.tableData = res.data.data.loadingAddressList || []
+          console.log(this.tableData, 111111111111)
           this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList
           this.vehicleList = res.data.data.orderItemList
@@ -2002,8 +2005,9 @@ export default {
         }
         detailDelegationList({ id: this.id.slice(2, this.id.length) }).then(res => {
           this.goodsForm = res.data.data
-          this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.goodsForm.id
+          // this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.goodsForm.id
           this.tableData = res.data.data.loadingAddressList || []
+          console.log(this.tableData, 111111111111)
           this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList
           this.vehicleList = res.data.data.orderItemList
@@ -2042,7 +2046,7 @@ export default {
       } else {
         detailDelegationList({ id: this.id }).then(res => {
           this.goodsForm = res.data.data
-          this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.goodsForm.id
+          // this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.goodsForm.id
           if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('总调度') !== -1) {
             this.goodsForm.status = 5
           }
@@ -2134,7 +2138,7 @@ export default {
         data.row.amount = Number(data.row.price) * Number(data.row.quantity)
       }
     }
-    this.$refs.other.show = false
+    // this.$refs.other.show = false
   },
   methods: {
     //单车运费计算

src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -81,7 +81,7 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.checkStatus != '录入' || editButton">一键删除</el-button>
+                                    :disabled="form.status != '录入' || editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -83,7 +83,7 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.checkStatus != '录入' || editButton">一键删除</el-button>
+                                    :disabled="form.status != '录入' || editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}