修改标签发放详情页面

src/components/DialogTagDistribute.vue

@@ -22,18 +22,18 @@
                 <my-select
                   v-model="data.deliveryMethodId"
                   :options="optionGroup.DeliveryType ? optionGroup.DeliveryType.list : []"
-                  :disabled="data.tagApplyStateId === '3'"
+                  :disabled="data.tagApplyStateId === '4'"
                 ></my-select>
             </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="发货单号" prop="deliveryOrderNo" :rules="[{required:true,message:'请输入发货单号'}]">
-            <el-input v-model="data.deliveryOrderNo" :disabled="(data.deliveryMethodId === '1') || (data.tagApplyStateId === '3')"/>
+          <el-form-item label="发货单号" prop="deliveryOrderNo" :rules= "(data.deliveryMethodId === '1') ? []:[{required:true,message:'请输入发货单号'}]">
+            <el-input v-model="data.deliveryOrderNo" :disabled="(data.deliveryMethodId === '1') || (data.tagApplyStateId === '4')"/>
           </el-form-item>
         </el-col>
         </el-row>
       </el-form>
-      <template #footer v-if="data && data.tagApplyStateId === '2'">
+      <template #footer v-if="data && data.tagApplyStateId === '3'">
       <div class="flex center dialog-footer">
         <el-button @click="onCloseBtnClick">取消</el-button>
         <el-button type="primary" @click="onSaveBtnClick">确定</el-button>

src/components/DialogTagDistributeDetail.vue

@@ -0,0 +1,124 @@
+<template>
+    <el-dialog
+      :visible.sync="visible"
+      :title="`订单详情 ${oData && oData.orderNo ? oData.orderNo : ''}`"
+      append-to-body
+      width="900px"
+    >
+      <div class="flex column" style="padding-bottom:20px;height:600px">
+        <div class="flex-1 fit-size">
+          <el-table
+            ref="table"
+            :data="list"
+            stripe
+            border
+            height="100%"
+            size="small"
+            class="custom-el-table-style"
+          >
+            <el-table-column
+              type="index"
+              label="序号"
+              width="60"
+              align="center"
+              fixed
+            ></el-table-column>
+            <el-table-column
+              label="商品编码"
+              prop="goodsCode"
+              header-align="center"
+              min-width="100"
+              align="center"
+              fixed
+            ></el-table-column>
+            <el-table-column
+              label="商品名称"
+              min-width="150"
+              prop="goodsName"
+              header-align="center"
+              align="center"
+              fixed
+            ></el-table-column>
+            <el-table-column
+              label="物料编码"
+              min-width="100"
+              prop="materielCode"
+              header-align="center"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="最小包装数量"
+              min-width="80"
+              prop="minimumPackingNumber"
+              header-align="center"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="最小包装单位"
+              min-width="80"
+              prop="minimumPackingUnit"
+              header-align="center"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="数量"
+              min-width="80"
+              prop="number"
+              header-align="center"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+                label="费用（元）"
+                prop="unitPrice"
+                align="right"
+                min-width="70"
+                header-align="center"
+              ></el-table-column>
+              <el-table-column
+                label="标签类型"
+                prop="tagTypeName"
+                align="left"
+                min-width="120"
+                header-align="center"
+              ></el-table-column>
+          </el-table>
+        </div>
+
+        <my-pagination
+          :total="total"
+          :pagination="pagination"
+          @current-change="currentPageNoChange"
+        />
+      </div>
+    </el-dialog>
+  </template>
+
+<script>
+import BaseCurdList from '@@/utils/BaseCurdList'
+import TagDistribute from '@@/entries/TagDistribute'
+
+export default {
+  name: 'DialogTagDistributeDetail',
+  extends: BaseCurdList(TagDistribute),
+  data: () => ({
+    visible: false,
+    oData: null
+  }),
+  methods: {
+    open (data) {
+      this.oData = data
+      this.pagination.pageNo = 1
+      this.visible = true
+      this.list = data.details
+    },
+    close () {
+      this.oData = null
+      this.visible = true
+      this.total = 0
+      this.list = Object.freeze([])
+    }
+  }
+}
+</script>
+
+<style lang="scss"></style>

src/views/TagDistribute.vue

@@ -64,14 +64,14 @@
               <el-table-column
                 label="申领日期"
                 prop="formatDataTime"
-                min-width="80"
+                min-width="100"
                 header-align="center"
                 align="center"
               ></el-table-column>
               <el-table-column
                 label="预期收货日期"
                 prop="formatExpectedReceiptDate"
-                min-width="80"
+                min-width="100"
                 header-align="center"
                 align="center"
               ></el-table-column>
@@ -83,31 +83,31 @@
                 align="left"
               ></el-table-column>
               <el-table-column
-                label="标签类型"
-                prop="tagTypeName"
-                min-width="120"
+                label="费用（元）"
+                prop="amount"
+                align="right"
+                min-width="70"
                 header-align="center"
-                align="left"
               ></el-table-column>
               <el-table-column
-                label="需求数量"
-                prop="number"
+                label="状态"
+                prop="tagApplyStateName"
+                align="center"
                 min-width="70"
                 header-align="center"
-                align="center"
               ></el-table-column>
               <el-table-column
-                label="费用"
-                prop="amount"
-                align="right"
-                min-width="70"
+                label="发货方式"
+                prop="deliveryMethodName"
+                align="center"
+                min-width="80"
                 header-align="center"
               ></el-table-column>
               <el-table-column
-                label="状态"
-                prop="tagApplyStateName"
+                label="发货单号"
+                prop="deliveryOrderNo"
                 align="center"
-                min-width="70"
+                min-width="120"
                 header-align="center"
               ></el-table-column>
               <el-table-column
@@ -119,14 +119,14 @@
               ></el-table-column>
               <el-table-column
                 label="操作栏"
-                min-width="80"
+                min-width="130"
                 header-align="center"
                 align="center"
               >
                 <template v-slot="{ row }">
                   <div class="flex center layout-gap">
-                    <edit-button v-if="row.tagApplyStateId === '3'" :data="row" :on-click="onOpenDetailEditorBtnClick" icon="el-icon-tickets">详情</edit-button>
-                    <edit-button v-else :data="row" :on-click="onOpenDetailEditorBtnClick" icon="el-icon-share" :disabled="row.tagApplyStateId !== '2'">发放</edit-button>
+                    <edit-button :data="row" :on-click="onOpenDetailEditorBtnClick" icon="el-icon-tickets">详情</edit-button>
+                    <edit-button :data="row" :on-click="onTagDistributeBtnClick" icon="el-icon-share" :disabled="row.tagApplyStateId !== '3' && row.tagApplyStateId !== '4'">发放</edit-button>
                   </div>
                 </template>
               </el-table-column>
@@ -145,6 +145,10 @@
       :optionGroup="optionGroup"
       @saved="loadList"
     ></dialog-tag-distribute>
+
+    <dialog-tag-distribute-detail
+      ref="tagDistributeDetailDialog"
+    ></dialog-tag-distribute-detail>
     </div>
   </template>
 
@@ -156,8 +160,14 @@ export default {
   name: 'TagDistribute',
   extends: BaseCurdList(TagDistribute),
   methods: {
+    onTagDistributeBtnClick (data) {
+      this.onOpenEditorBtnClick(data, data.tagApplyStateId === '4')
+    },
     onOpenDetailEditorBtnClick (data) {
-      this.onOpenEditorBtnClick(data, data.tagApplyStateId === '3')
+      this.$$request(TagDistribute.$$api.getDetail, data, this)
+        .then(data => {
+          this.$refs.tagDistributeDetailDialog.open(data)
+        }).catch(console.error).finally(() => {})
     }
   }
 }