修改订单bug

src/views/delivery/deliveryLog/components/deliveryLogDetail.vue

@@ -1,46 +1,69 @@
 <template>
-  <el-drawer
-    title="发货清单详情"
-    size="60%"
-    :append-to-body="true"
-    :visible.sync="centervisible"
-    @close='close'>
-    <div class="box1">
-      <el-row>
-        <el-col :span='12'>
-          <span class="title">订单名：</span>
-          <span class="text">{{orderName ? orderName : '-'}}</span>
-        </el-col>
-        <el-col :span='12'>
-          <span class="title">发货单号：</span>
-          <span class="text">{{code ? code : '-'}}</span>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="box2">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>详情</span>
+  <div>
+    <el-drawer
+      title="发货清单详情"
+      size="60%"
+      :append-to-body="true"
+      :visible.sync="centervisible"
+      @close='close'>
+      <div class="box1">
+        <el-row>
+          <el-col :span='12'>
+            <span class="title">订单名：</span>
+            <span class="text">{{orderName ? orderName : '-'}}</span>
+          </el-col>
+          <el-col :span='12'>
+            <span class="title">发货单号：</span>
+            <span class="text">{{code ? code : '-'}}</span>
+          </el-col>
+        </el-row>
       </div>
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="tableData"
-        :max-height="tableH"
-      />
-      <pagination
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
-        :total="total"
-        @pagination="getList"
-      />
-    </div>
-  </el-drawer>
+      <div class="box2">
+        <div class="boxTitle">
+          <span class="blueTitle"></span>
+          <span>详情</span>
+        </div>
+        <base-table
+          :page="queryParams.pageNo"
+          :limit="queryParams.pageSize"
+          :table-props="tableProps"
+          :table-data="tableData"
+          :max-height="tableH"
+        >
+          <method-btn
+            v-if="tableBtn.length"
+            slot="handleBtn"
+            :width="80"
+            label="操作"
+            :method-list="tableBtn"
+            @clickBtn="editDetDetail"
+          />
+        </base-table>
+        <pagination
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          :total="total"
+          @pagination="getList"
+        />
+      </div>
+    </el-drawer>
+    <!-- 编辑详情 -->
+    <base-dialog
+      dialogTitle="编辑"
+      :dialogVisible="detailEditVisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width="50%"
+    >
+			<edit-detail ref="editDetail" @successSubmit="successSubmit" />
+		</base-dialog>
+  </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { deliveryLogDetPage } from '@/api/base/delivery'
+import EditDetail from './editDetail.vue'
 const tableProps = [
   {
     prop: 'createTime',
@@ -51,6 +74,7 @@ const tableProps = [
   {
     prop: 'deliveryCarCode',
     label: '装车单号',
+    minWidth: 100,
     showOverflowtooltip: true
   },
   {
@@ -96,11 +120,21 @@ export default {
       total: 0,
       tableProps,
       tableData: [],
+      tableBtn: [
+        this.$auth.hasPermi('extend:delivery-log:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined
+      ].filter((v) => v),
       tableH: this.tableHeight(275),
       orderName: '',
-      code: ''
+      code: '',
+      detailEditVisible: false
     }
   },
+  components: { EditDetail },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(275)
@@ -128,6 +162,23 @@ export default {
       this.queryParams.logId = ''
       this.tableData = []
       this.total = 0
+    },
+    editDetDetail(val) {
+      this.detailEditVisible = true
+      this.$nextTick(() => {
+        this.$refs.editDetail.init(val.data.id)
+      })
+    },
+    handleCancel() {
+      this.$refs.editDetail.formClear()
+      this.detailEditVisible = false
+    },
+    handleConfirm() {
+      this.$refs.editDetail.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
     }
   }
 }

src/views/delivery/deliveryLog/components/editDetail.vue

@@ -0,0 +1,124 @@
+<template>
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车单号" prop="deliveryCarCode">
+          <el-input v-model="form.deliveryCarCode"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装车时间" prop="loadTime">
+          <el-date-picker
+            v-model="form.loadTime"
+            type="datetime"
+            format='yyyy-MM-dd HH:mm:ss'
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车产品" prop="productId">
+          <el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装箱规格(片/箱)" prop="packagingSize">
+          <el-input-number v-model="form.packagingSize" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="产品批次" prop="productDate">
+          <el-input v-model="form.productDate" placeholder="多个批次用','隔开"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="箱/托数" prop="packagingNum">
+          <el-input-number v-model="form.packagingNum" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车总量" prop="quantity">
+          <el-input-number v-model="form.quantity" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getProductAll } from '@/api/base/product'
+import { deliveryLogDetGet, deliveryLogDetUpdate } from '@/api/base/delivery'
+export default {
+  name: 'editDetail',
+  data() {
+    return {
+      form: {
+        logId: '',
+        deliveryCarCode: '',
+        loadTime: null,
+        productId: '',
+        packagingSize: null,
+        productDate: '',
+        packagingNum: null,
+        quantity: null
+      },
+      rules: {
+        deliveryCarCode: [{ required: true, message: "装车单号不能为空", trigger: "blur" }],
+        productId: [{ required: true, message: "装车产品不能为空", trigger: "change" }],
+        packagingSize: [{ required: true, message: "装箱规格不能为空", trigger: "blur" }],
+        packagingNum: [{ required: true, message: "箱/托数不能为空", trigger: "blur" }],
+        quantity: [{ required: true, message: "装车总量不能为空", trigger: "blur" }]
+      },
+      productList: []
+    }
+  },
+  mounted() {
+    this.getSelectList()
+  },
+  methods: {
+    init(id) {
+      deliveryLogDetGet({id}).then(res => {
+        console.log(res)
+        this.form = res.data
+      })
+    },
+    getSelectList() {
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+    },
+    submitForm() {
+      this.$refs['addOrUpdate'].validate((valid) => {
+        if (valid) {
+          console.log(this.form)
+          deliveryLogDetUpdate({ ...this.form }).then((res) => {
+            if (res.code === 0) {
+              this.$modal.msgSuccess("操作成功");
+              this.$emit('successSubmit')
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addOrUpdate.resetFields()
+    }
+  }
+}
+</script>

src/views/delivery/deliveryLog/index.vue

@@ -302,7 +302,7 @@ export default {
     successSubmit2() {
       this.handleCancel2()
       this.getList()
-    },
+    }
   }
 }
 </script>

src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue

@@ -19,11 +19,11 @@
         <div class="lightTip">{{orderMsg.num ? orderMsg.num : '-'}}</div>
       </div>
       <div class="box_col">
-        <div class="blodTip">累积占比(%)</div>
+        <div class="blodTip">累计占比(%)</div>
         <div class="lightTip">{{orderMsg.rate ? orderMsg.rate : '-'}}</div>
       </div>
       <div class="box_col">
-        <div class="blodTip">累积运输费用</div>
+        <div class="blodTip">累计运输费用</div>
         <div class="lightTip">{{orderMsg.cost ? orderMsg.cost : '-'}}</div>
       </div>
     </div>
@@ -305,8 +305,11 @@ export default {
           }
         },
         legend: {
-          bottom: '5%',
-          left: 'center',
+          type: 'scroll',
+          orient: 'vertical',
+          right: '10%',
+          top: 20,
+          bottom: 20,
           icon: 'rect',
           itemHeight: 8,
           itemWidth: 8

src/views/delivery/deliveryLogDet/index.vue

@@ -61,7 +61,7 @@ const tableProps = [
   },
   {
     prop: 'rate',
-    label: '累积发货比例(%)'
+    label: '累计发货比例(%)'
   }
 ]
 export default {