lilei hai 11 meses
pai
achega
fba7e8396f

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1720749771224
+  "version": 1720756102691
 }

+ 19 - 16
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -7,17 +7,17 @@
           <a-row :gutter="15">
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate id="outboundOrderList-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="关联单号">
-                <a-input v-model.trim="queryParam.outBizNo" placeholder="请输入关联单号" allowClear />
+                <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" placeholder="请输入关联单号" allowClear />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="客户名称">
-                <a-input v-model.trim="queryParam.demanderNameCurrent" placeholder="请输入客户名称" allowClear />
+                <a-input id="outboundOrderList-demanderNameCurrent" v-model.trim="queryParam.demanderNameCurrent" placeholder="请输入客户名称" allowClear />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="8">
@@ -52,7 +52,7 @@
         </a-form>
       </div>
       <div v-if="$hasPermissions('B_outboundBatchOut')" style="margin-bottom: 10px">
-        <a-button type="primary" id="outboundOrderList-export" :loading="loading" @click="handleOutbounds">批量出库</a-button>
+        <a-button type="primary" id="outboundOrderList-out-btn" :loading="loading" @click="handleOutbounds">批量出库</a-button>
         <span style="margin-left: 5px" v-if="$hasPermissions('B_outboundBatchOut')">
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0">
             {{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}
@@ -98,14 +98,14 @@
             v-if="record.state=='WAIT'&&$hasPermissions('B_outboundOut')"
             class="button-primary"
             @click="handleOutbound(record)"
-            id="outboundOrderList-out-btn">出库</a-button>
+            :id="'outboundOrderList-out-'+record.id">出库</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="$hasPermissions('B_outboundOrderDetail')"
+            v-if="$hasPermissions('B_outboundOrderDetail')&&detailPermissions(record)"
             class="button-success"
             @click="handleDetail(record)"
-            id="outboundOrderList-detail-btn">详情</a-button>
+            :id="'outboundOrderList-detail-'+record.id">详情</a-button>
           <span v-if="!(record.state=='WAIT'&&$hasPermissions('B_outboundOut')) && !($hasPermissions('B_outboundOrderDetail'))">--</span>
         </template>
       </s-table>
@@ -123,13 +123,19 @@
       @cancel="cancleModal"
       width="80%">
       <div style="max-height: 700px;overflow-y: auto;">
+        <!-- 备货单详情 -->
         <pushOrderDetailModal v-if="outBizType=='PURCHASE_RETURN'" :outBizSn="orderSn" />
+        <!-- 销售单详情 -->
         <salesDetailModal v-if="outBizType=='SALES'" :outBizSn="orderSn" />
+        <!-- 冲减急件 -->
         <urgentDetailModal v-if="outBizType=='DISPATCH_DEDUCT'" :outBizSn="orderSn" />
+        <!-- 店内调出详情 -->
         <storeTransferOutDetailModal v-if="outBizType=='SHOP_CALL_OUT'" :outBizSn="orderSn" />
+        <!-- 连锁调出详情 -->
         <chainTransferOutDetailModal v-if="outBizType=='LINKAGE_CALL_OUT'" :outBizSn="orderSn" />
+        <!-- 仓库调出详情 -->
         <warehouseAllocationDetailModal v-if="outBizType=='WAREHOUSE_CALL_OUT'" :outBizSn="orderSn" />
-        <warehouseAllocationDetailModal v-if="outBizType=='WAREHOUSE_CALL_OUT'" :outBizSn="orderSn" />
+        <!-- 货架补货 -->
         <replenishmentDetailModal v-if="outBizType=='SHELF_REPLENISH'" :outBizSn="orderSn"></replenishmentDetailModal>
       </div>
     </a-modal>
@@ -222,6 +228,7 @@ export default {
     }
   },
   methods: {
+    // 打开唯一码弹框
     openCodeModal () {
       this.showUniqueCode = true
     },
@@ -229,9 +236,9 @@ export default {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
     },
+    //  根据出库类型和对应功能权限 判断是否有查看详情的权限
     detailPermissions (row) {
       let state = false
-      //  根据出库类型和对应功能权限 判断是否有查看详情的权限
       if ((row.outBizType == 'PURCHASE_RETURN') && this.$hasPermissions('B_purchaseReturnDetail')) { // 采购退货
         state = true
       } else if ((row.outBizType == 'SALES') && this.$hasPermissions('B_salesDetail')) { // 销售
@@ -247,16 +254,11 @@ export default {
       }
       return state
     },
-    //  时间  change
+    //  选择时间  change
     dateChange (date) {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     // 查询
     searchForm () {
       this.$refs.table.clearSelected() // 清空表格选中项
@@ -282,7 +284,6 @@ export default {
     handleDetail (row) {
       this.outBizType = row.outBizType
       this.detailTitle = row.outBizTypeDictValue + '详情'
-      console.log(row.outBizType)
       //  根据出库类型跳转对应页面
       if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
         this.orderSn = row.outBizSn
@@ -364,6 +365,7 @@ export default {
         }
       })
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -371,6 +373,7 @@ export default {
       })
       this.$refs.table.clearSelected() // 清空表格选中项
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 245

+ 7 - 7
src/views/outboundOrderManagement/outboundOrder/uniqueCodeListModal.vue

@@ -15,13 +15,13 @@
           <a-row :gutter="15">
             <a-col :md="8" :sm="24">
               <a-form-item label="唯一码">
-                <a-input v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入产品编码"/>
+                <a-input id="uniqueCode-no" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a-button id="uniqueCode-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button id="uniqueCode-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
               </span>
             </a-col>
           </a-row>
@@ -29,12 +29,12 @@
       </div>
       <div class="codebox">
         <div class="btn">
-          <a-button type="primary" @click="handlePlAdd">批量添加</a-button>
+          <a-button id="uniqueCode-batch-add" type="primary" @click="handlePlAdd">批量添加</a-button>
           <span style="margin-left: 10px;" v-if="selectTotal">已选{{ selectTotal }}项</span>
           <span style="margin-left: 10px;">可选{{ selectTotal }}项</span>
         </div>
         <div class="codeList" v-if="plainOptions&&plainOptions.length>0">
-          <a-checkbox-group v-model="chooseList" :options="plainOptions" @change="onChange" />
+          <a-checkbox-group id="uniqueCode-checkbox" v-model="chooseList" :options="plainOptions" @change="onChange" />
         </div>
         <div v-else>
           <a-empty />
@@ -52,7 +52,7 @@ export default {
       type: Boolean,
       default: false
     },
-    codeInfo: {
+    codeInfo: { // 唯一码信息
       type: String,
       default: ''
     }
@@ -63,7 +63,7 @@ export default {
       chooseList: [],
       plainOptions: ['8217618375', '8217618376', '8217618377', '8217618378', '8217618379', '8217618380', '8217618381'],
       queryParam: {
-        outBizSubNo: ''
+        outBizSubNo: '' // 产品编码
       }
     }
   },