lilei 11 ay önce
ebeveyn
işleme
e9ecd508b5

+ 1 - 1
public/version.json

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

+ 5 - 3
src/views/bulkManagement/bulkImport/chooseImportModal.vue

@@ -86,8 +86,8 @@ export default {
     const _this = this
     return {
       isShow: this.openModal, //  是否打开弹框
-      openTipsModal: false,
-      modalHtml: '',
+      openTipsModal: false, // 提示弹框
+      modalHtml: '', // 提示弹框标题
       spinning: false,
       exportLoading: false, // 导出loading
       // 加载数据方法 必须为 Promise 对象
@@ -112,7 +112,7 @@ export default {
         })
       },
       isAllError: false, // 是否全部错误
-      listData: [],
+      listData: [], // 列表数据
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 30, align: 'center' },
@@ -134,6 +134,7 @@ export default {
     }
   },
   methods: {
+    // 重置
     resetSearchForm () {
       this.$refs.table.clearTable() //  清空列表数据
       this.uploadData = null //  清空上传数据
@@ -156,6 +157,7 @@ export default {
         }
       })
     },
+    // 显示导入成功弹框
     showSuccessModal (data) {
       if (data) {
         this.openTipsModal = true

+ 3 - 3
src/views/bulkManagement/bulkImport/importGuideModal.vue

@@ -20,7 +20,7 @@
             <li>3) 供应商/产品品牌为必填项且不能包含箭冠、箭牌、冠牌等文字,产品名称为必填项。</li>
             <li>4) 支持上传文件格式:.xls、.xlsx。</li>
             <li>
-              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+              <a :href="filePath" id="importGuide-tpl-link" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板
               </a>
             </li>
@@ -90,10 +90,10 @@ export default {
       openImportModal: false, //  导入
       attachAction: process.env.VUE_APP_API_BASE_URL + '/stockImport/importForSpareParts',
       paramsData: null,
-      uploadParams: {
+      uploadParams: { // 参数
         savePathType: 'local'
       },
-      filePath: location.protocol + '//' + location.host + '/templ/散件产品导入模板.xlsx'
+      filePath: location.protocol + '//' + location.host + '/templ/散件产品导入模板.xlsx' // 模板文件地址
     }
   },
   methods: {

+ 13 - 11
src/views/bulkManagement/bulkImport/list.vue

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="8" :sm="24">
               <a-form-model-item label="导入时间" prop="time">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="inventoryImport-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -59,7 +59,7 @@
         bordered>
         <!-- 导入单号 -->
         <template slot="stockImportNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_bulkImportDeail')" class="table-td-link" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
+          <span :id="'inventoryImport-detail-'+record.stockImportSn" v-if="$hasPermissions('B_bulkImportDeail')" class="table-td-link" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
           <span v-else>{{ record.stockImportNo||'--' }}</span>
         </template>
       </s-table>
@@ -96,25 +96,25 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [
+        time: [ // 时间默认值
           getDate.getThreeMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: '',
-        endDate: '',
-        stockImportNo: undefined,
-        importType: 'SPARE_PARTS_IMPORT'
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        stockImportNo: undefined, // 导入单号
+        importType: 'SPARE_PARTS_IMPORT'// 导入类型
       },
-      openGuideModal: false,
-      detailSn: undefined,
+      openGuideModal: false, // 打开导入弹框
+      detailSn: undefined, // 详情sn
       rules: {
         'time': [{ required: true, message: '请选择导入时间', trigger: 'change' }]
       },
       openBulkImportDetail: false, // 明细弹窗
       disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
+      exportLoading: false, // 导入按钮loading
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -212,10 +212,12 @@ export default {
       this.$refs.table.clearTable()
       this.handleSearch()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 276
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 15 - 8
src/views/bulkManagement/bulkReturnGoods/basicInfoModal.vue

@@ -21,18 +21,25 @@
             placeholder="请输入名称查询,如果没有请点击 '+' 新增"
             allowClear
             v-model="form.supplierSn"
+            id="bulkReturnGoods-supplierSn"
             :showSearch="true"
             option-filter-prop="children"
             :filter-option="filterOption"
             style="width: 80%;">
-            <a-select-option v-for="item in supplierList" :key="item.supplierSn" :pyCode="item.pyCode" :value="item.supplierSn" :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
+            <a-select-option
+              v-for="item in supplierList"
+              :id="'supplierSn-'+item.supplierSn"
+              :key="item.supplierSn"
+              :pyCode="item.pyCode"
+              :value="item.supplierSn"
+              :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
           </a-select>
           <a-button icon="plus" size="small" @click="openSupplierModal=true" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
         </a-form-model-item>
         <a-form-model-item label="是否抓单" prop="isGrab">
-          <a-radio-group v-model="form.isGrab">
-            <a-radio value="1">是</a-radio>
-            <a-radio value="0">否</a-radio>
+          <a-radio-group v-model="form.isGrab" id="bulkReturnGoods-isGrab">
+            <a-radio value="1" id="isGrab-1">是</a-radio>
+            <a-radio value="0" id="isGrab-0">否</a-radio>
           </a-radio-group>
         </a-form-model-item>
         <a-form-model-item label="备注" prop="remark">
@@ -75,9 +82,9 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        supplierSn: undefined,
-        isGrab: '1',
-        remark: ''
+        supplierSn: undefined, // 供应商sn
+        isGrab: '1', // 是否抓单,默认抓单
+        remark: '' // 备注
       },
       rules: {
         supplierSn: [ { required: true, message: '请选择供应商', trigger: 'change' } ],
@@ -108,11 +115,11 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
     },
+    // 供应商名称筛选
     filterOption (input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
       option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue

@@ -148,7 +148,7 @@ export default {
         this.isShow = false
       }
     },
-    // 导出
+    // 导出错误项
     handleError () {
       const _this = this
       if (_this.paramsData.errorList.length < 1) {

+ 5 - 5
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -61,15 +61,15 @@ export default {
   components: { STable, Print },
   mixins: [commonMixin],
   props: {
-    openModal: { //  弹框显示状态
+    openModal: { // 弹框显示状态
       type: Boolean,
       default: false
     },
-    itemSn: {
+    itemSn: { // 当前数据sn
       type: String || Number,
       default: ''
     },
-    isGrab: {
+    isGrab: { // 是否抓单
       type: String || Number,
       default: ''
     }
@@ -78,7 +78,7 @@ export default {
     return {
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
-      dataSource: [],
+      dataSource: [], // 列表数据
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -101,7 +101,7 @@ export default {
         })
       },
       basicInfoData: null, //  基本信息
-      productTotal: null
+      productTotal: null // 合计数据
     }
   },
   computed: {

+ 28 - 25
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -67,7 +67,7 @@
             <div @dblclick.stop>
               <a-input-number
                 size="small"
-                id="bulkReturnGoodsEdit-purchaseCost"
+                :id="'bulkReturnGoodsEdit-purchaseCost-'+record.stockDetailSn"
                 v-model="record.purchaseCost"
                 :precision="2"
                 :min="0"
@@ -81,7 +81,7 @@
             <div @dblclick.stop>
               <a-input-number
                 size="small"
-                id="bulkReturnGoodsEdit-purchaseQty"
+                :id="'bulkReturnGoodsEdit-purchaseQty-'+record.stockDetailSn"
                 v-model="record.purchaseQty"
                 :precision="0"
                 :min="1"
@@ -98,7 +98,7 @@
               type="link"
               class="button-primary"
               @click="handleAdd(record)"
-              id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+              :id="'bulkReturnGoodsEdit-add-'+record.stockDetailSn">添加</a-button>
             <span v-else>--</span>
           </template>
         </s-table>
@@ -121,17 +121,17 @@
                 <a-row :gutter="15">
                   <a-col :md="9" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
-                      <a-input id="bulkReturnGoodsEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
+                      <a-input id="chooseTable-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="9" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
-                      <a-input id="bulkReturnGoodsEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
+                      <a-input id="chooseTable-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="bulkReturnGoodsEdit-refresh">查询</a-button>
-                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="bulkReturnGoodsEdit-reset">重置</a-button>
+                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="chooseTable-refresh">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="chooseTable-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form>
@@ -142,12 +142,12 @@
               type="default"
               @click="openGuideModal=true"
               style="margin-right:5px;"
-              id="bulkReturnGoodsEdit-import">导入产品</a-button>
+              id="chooseTable-import">导入产品</a-button>
             <a-button
               class="button-error"
               type="primary"
               @click="bulkReturnGoodsDelAll"
-              id="bulkReturnGoodsEdit-clear"
+              id="chooseTable-clearall"
               :loading="delLoading"
               ghost>清空列表 </a-button>
           </a-col>
@@ -167,7 +167,7 @@
           <template slot="purchaseCost" slot-scope="text, record">
             <a-input-number
               size="small"
-              id="bulkReturnGoodsEdit-purchaseCost"
+              :id="'chooseTable-purchaseCost-'+record.id"
               v-model="record.purchaseCost"
               :precision="2"
               :min="0"
@@ -180,7 +180,7 @@
           <template slot="purchaseQty" slot-scope="text, record">
             <a-input-number
               size="small"
-              id="bulkReturnGoodsEdit-purchaseQty"
+              :id="'chooseTable-purchaseQty-'+record.id"
               v-model="record.purchaseQty"
               :precision="0"
               :min="1"
@@ -191,7 +191,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" :id="'chooseTable-del-'+record.id">删除</a-button>
           </template>
         </s-table>
       </a-card>
@@ -237,14 +237,15 @@ export default {
     const _this = this
     return {
       spinning: false,
-      openGuideModal: false,
+      openGuideModal: false, // 导入产品弹窗
+      // 查询参数
       queryParam: {
-        productCode: '',
-        productName: '',
-        warehouseSn: undefined
+        productCode: '', // 产品编码
+        productName: '', // 产品名称
+        warehouseSn: undefined // 仓库sn
       },
       disabled: false, //  查询、重置按钮是否可操作
-      dataSource: [],
+      dataSource: [], // 表格数据
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -273,10 +274,10 @@ export default {
           return data
         })
       },
-      chooseDisabled: false,
+      chooseDisabled: false, // 禁用按钮
       chooseQueryParam: {
-        productCode: '',
-        productName: ''
+        productCode: '', // 产品编码
+        productName: ''// 产品名称
       },
       // 表头
       chooseColumns: [
@@ -309,10 +310,10 @@ export default {
           return data
         })
       },
-      localDataSource: [],
+      localDataSource: [], // 已选产品数据
       productTotal: null, //  合计
       warehouseList: [], // 仓库列表
-      delLoading: false
+      delLoading: false // 按钮laoding
     }
   },
   methods: {
@@ -478,14 +479,14 @@ export default {
         }
       })
     },
-    // 已选产品 单价  blur
+    // 已选产品 单价修改  blur
     purchaseCostBlur (val, record) {
       //  光标移出,值发生改变再调用编辑接口
       if (val != record.purchaseCostBackups) {
         this.handleAdd(record, 'edit')
       }
     },
-    // 已选产品 数量  blur
+    // 已选产品 数量修改  blur
     purchaseQtyBlur (val, record) {
       if (val != record.purchaseQtyBackups) {
         this.handleAdd(record, 'edit')
@@ -493,7 +494,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
+      this.$router.push({ name: 'bulkReturnGoodsList' })
     },
     // 双击快速添加
     handleClickRow (record) {
@@ -509,11 +510,13 @@ export default {
         }
       })
     },
+    // 仓库筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    // 页面初始化
     initPage () {
       this.getWarehouse()
       this.resetSearchForm()

+ 24 - 31
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -57,7 +57,7 @@
             <div @dblclick.stop>
               <a-input-number
                 size="small"
-                id="bulkReturnGoodsEdit-purchaseCost"
+                :id="'bulkReturnGoodsEdit-purchaseCost-'+record.id"
                 v-model="record.purchaseCost"
                 :precision="2"
                 :min="0"
@@ -71,7 +71,7 @@
             <div @dblclick.stop>
               <a-input-number
                 size="small"
-                id="bulkReturnGoodsEdit-purchaseQty"
+                :id="'bulkReturnGoodsEdit-qty-'+record.id"
                 v-model="record.purchaseQty"
                 :precision="0"
                 :min="1"
@@ -104,17 +104,17 @@
                 <a-row :gutter="15">
                   <a-col :md="9" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
-                      <a-input id="bulkReturnGoodsEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
+                      <a-input id="chooseTable-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="9" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
-                      <a-input id="bulkReturnGoodsEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
+                      <a-input id="chooseTable-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="bulkReturnGoodsEdit-refresh">查询</a-button>
-                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="bulkReturnGoodsEdit-reset">重置</a-button>
+                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="chooseTable-refresh">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="chooseTable-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form>
@@ -125,6 +125,7 @@
               class="button-error"
               type="primary"
               @click="bulkReturnGoodsDelAll"
+              id="chooseTable-clearAll"
               :loading="delLoading"
               ghost>清空列表 </a-button>
           </a-col>
@@ -144,7 +145,7 @@
           <template slot="purchaseCost" slot-scope="text, record">
             <a-input-number
               size="small"
-              id="bulkReturnGoodsEdit-purchaseCost"
+              :id="'chooseTable-purchaseCost-'+record.id"
               v-model="record.purchaseCost"
               :precision="2"
               :min="0"
@@ -157,7 +158,7 @@
           <template slot="purchaseQty" slot-scope="text, record">
             <a-input-number
               size="small"
-              id="bulkReturnGoodsEdit-purchaseQty"
+              :id="'chooseTable-purchaseQty-'+record.id"
               v-model="record.purchaseQty"
               :precision="0"
               :min="1"
@@ -168,7 +169,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" :id="'chooseTable-del-'+record.id">删除</a-button>
           </template>
         </s-table>
       </a-card>
@@ -211,12 +212,12 @@ export default {
     return {
       spinning: false,
       queryParam: {
-        productCode: '',
-        productName: '',
-        sparePartsPurchaseNo: ''
+        productCode: '', // 产品编码
+        productName: '', // 产品名称
+        sparePartsPurchaseNo: ''// 散件入库单号
       },
       disabled: false, //  查询、重置按钮是否可操作
-      dataSource: [],
+      dataSource: [], // 产品列表数据
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -249,10 +250,10 @@ export default {
           return data
         })
       },
-      chooseDisabled: false,
+      chooseDisabled: false, // 已选产品按钮禁用
       chooseQueryParam: {
-        productCode: '',
-        productName: ''
+        productCode: '', // 产品编码
+        productName: ''// 产品名称
       },
       // 表头
       chooseColumns: [
@@ -283,14 +284,14 @@ export default {
           return data
         })
       },
-      localDataSource: [],
+      localDataSource: [], // 已选列表数据
       productTotal: null, //  合计
       warehouseList: [], // 仓库列表
-      delLoading: false
+      delLoading: false // 删除按钮loading
     }
   },
   methods: {
-    // 打印预览/快捷打印
+    // 打印预览/快捷打印、导出
     handlePrint (type, printerType) {
       const _this = this
       _this.spinning = true
@@ -442,14 +443,14 @@ export default {
         }
       })
     },
-    // 已选产品 单价  blur
+    // 已选产品 单价修改  blur
     purchaseCostBlur (val, record) {
       //  光标移出,值发生改变再调用编辑接口
       if (val != record.purchaseCostBackups) {
         this.handleAdd(record, 'edit')
       }
     },
-    // 已选产品 数量  blur
+    // 已选产品 数量修改  blur
     purchaseQtyBlur (val, record) {
       if (val != record.purchaseQtyBackups) {
         this.handleAdd(record, 'edit')
@@ -457,11 +458,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
-    },
-    //  导入明细
-    handleImport () {
-      console.log(333)
+      this.$router.push({ name: 'bulkReturnGoodsList' })
     },
     // 双击快速添加
     handleClickRow (record) {
@@ -477,11 +474,7 @@ export default {
         }
       })
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
+    // 初始化页面
     initPage () {
       this.getWarehouse()
       this.resetSearchForm()

+ 36 - 36
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -7,17 +7,17 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate id="bulkReturnGoodsList-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+                <rangeDate id="bulkReturnGoodsList-auditTime" ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="出库时间">
-                <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+                <rangeDate id="bulkReturnGoodsList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -60,7 +60,7 @@
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkReturnGoodsList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkReturnGoodsList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 8px" id="bulkReturnGoodsList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -86,7 +86,7 @@
         bordered>
         <!-- 散件退货单号 -->
         <template slot="sparePartsReturnNo" slot-scope="text, record">
-          <span class="table-td-link" v-if="$hasPermissions('B_bulkReturnGoodsDetail')" @click="handleDetail(record)">{{ record.sparePartsReturnNo }}</span>
+          <span class="table-td-link" :id="'bulkReturnGoodsList-detail-'+record.id" v-if="$hasPermissions('B_bulkReturnGoodsDetail')" @click="handleDetail(record)">{{ record.sparePartsReturnNo }}</span>
           <span v-else>{{ record.sparePartsReturnNo }}</span>
         </template>
         <!-- 审核 -->
@@ -110,28 +110,28 @@
             v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_bulkReturnGoodsEdit')"
             @click="handleEdit(record)"
             class="button-primary"
-            id="bulkReturnGoodsList-edit-btn">编辑</a-button>
+            :id="'bulkReturnGoodsList-edit-'+record.id">编辑</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_bulkReturnGoodsOutStock')"
             @click="handleWarehouse(record)"
             class="button-primary"
-            id="bulkReturnGoodsList-warehouse-btn">出库</a-button>
+            :id="'bulkReturnGoodsList-out-'+record.id">出库</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_bulkReturnGoodsAudit')"
             @click="handleEexamine(record)"
             class="button-primary"
-            id="bulkReturnGoodsList-warehouse-btn">审核</a-button>
+            :id="'bulkReturnGoodsList-audit-'+record.id">审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_bulkReturnGoodsDel')"
             @click="handleDel(record)"
             class="button-error"
-            id="bulkReturnGoodsList-del-btn">删除</a-button>
+            :id="'bulkReturnGoodsList-del-'+record.id">删除</a-button>
           <span v-if="!((record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && ($hasPermissions('B_bulkReturnGoodsEdit') || $hasPermissions('B_bulkReturnGoodsDel'))) && !(record.state == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_bulkReturnGoodsOutStock')) && !(record.state == 'WAIT_AUDIT' && $hasPermissions('B_bulkReturnGoodsAudit'))">--</span>
         </template>
       </s-table>
@@ -166,24 +166,24 @@ export default {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
-      time: [
+      time: [ // 创建时间默认值
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
-      auditTime: [],
-      outWareTime: [],
+      auditTime: [], // 审核时间
+      outWareTime: [], // 出库时间
       queryParam: { //  查询条件
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        auditBeginDate: '',
-        auditEndDate: '',
-        outWarehouseBeginDate: '',
-        outWarehouseEndDate: '',
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
+        auditBeginDate: '', // 审核开始时间
+        auditEndDate: '', // 审核结束时间
+        outWarehouseBeginDate: '', // 出库开始时间
+        outWarehouseEndDate: '', // 出库结束时间
         sparePartsReturnNo: '', //  散件退货单号
         supplierSn: undefined, //  供应商
-        isGrab: undefined,
-        settleState: undefined,
-        state: undefined
+        isGrab: undefined, // 是否抓单
+        settleState: undefined, // 财务状态
+        state: undefined// 业务状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -222,35 +222,31 @@ export default {
         })
       },
       openModal: false, // 基本信息弹框是否显示
-      openDetailModal: false,
-      itemSn: null,
-      isGrab: null,
-      visibleAudit: false,
-      auditInfo: null,
-      spinningAudit: false
+      openDetailModal: false, // 详情弹框
+      itemSn: null, // 当前操作sn
+      isGrab: null, // 是否抓单
+      visibleAudit: false, // 审核弹框
+      auditInfo: null, // 审核信息
+      spinningAudit: false // 审核loading
     }
   },
   methods: {
-    //  时间  change
+    //  创建时间  change
     dateChange (date) {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    // 审核时间
     auditDateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
-        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-    //  重置
+    // 重置表单
     resetSearchForm () {
       this.resetData()
       this.$refs.table.refresh(true)
@@ -338,11 +334,12 @@ export default {
         }
       })
     },
-    //  审核
+    //  打开审核弹框
     handleEexamine (row) {
       this.auditInfo = row
       this.visibleAudit = true
     },
+    // 提交审核
     auditOrder (billStatus) {
       this.spinningAudit = true
       sparePartsRetAudit({
@@ -360,11 +357,13 @@ export default {
         }
       })
     },
+    // 详情弹框关闭
     handleDetailClose () {
       this.itemSn = null
       this.isGrab = null
       this.openDetailModal = false
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -404,6 +403,7 @@ export default {
         }
       }
     },
+    // 表格高度设置
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235

+ 10 - 3
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -24,14 +24,21 @@
             :showSearch="true"
             option-filter-prop="children"
             :filter-option="filterOption"
+            id="bulkWarehousingOrder-supplierSn"
             style="width: 80%;">
-            <a-select-option v-for="item in supplierList" :key="item.supplierSn" :pyCode="item.pyCode" :value="item.supplierSn" :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
+            <a-select-option
+              v-for="item in supplierList"
+              :id="'supplierSn-'+item.supplierSn"
+              :key="item.supplierSn"
+              :pyCode="item.pyCode"
+              :value="item.supplierSn"
+              :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
           </a-select>
           <a-button icon="plus" size="small" @click="openSupplierModal=true" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
         </a-form-model-item>
         <a-form-model-item label="散件入库类型" prop="sparePartsType">
           <a-select id="bulkWarehousingOrder-basicInfo-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="form.sparePartsType">
-            <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
+            <a-select-option v-for="item in sparePartsPutTypeList" :id="'sn-'+item.sparePartsPutTypeSn" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-model-item>
         <a-form-model-item label="备注" prop="remarks">
@@ -117,7 +124,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -127,6 +133,7 @@ export default {
       //  获取供应商数据列表,并赋值
       this.getSupplierList('val')
     },
+    // 供应商名称筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||

+ 8 - 5
src/views/bulkManagement/bulkWarehousingOrder/chooseImportModal.vue

@@ -15,18 +15,18 @@
           可导入数据{{ loadData.length }}条
           <div v-if="disableProduct.length">
             ,其中<span style="color: red;">{{ disableProduct.length }}个禁用产品</span>,请确认已禁用的产品是否导入?
-            <a-radio-group v-model="importDisabled">
-              <a-radio :value="1">
+            <a-radio-group v-model="importDisabled" id="importDisabled">
+              <a-radio :value="1" id="importDisabled-1">
                 导入
               </a-radio>
-              <a-radio :value="0">
+              <a-radio :value="0" id="importDisabled-0">
                 不导入
               </a-radio>
             </a-radio-group>
           </div>
         </div>
         <div v-if="disableProduct.length">
-          <a-checkbox v-model="showDisable">
+          <a-checkbox v-model="showDisable" id="showDisable">
             仅显示已禁用产品
           </a-checkbox>
         </div>
@@ -154,6 +154,7 @@ export default {
     disableProduct () {
       return this.rightData.filter(item => item.productEnableFlag == 0)
     },
+    // 过滤列表数据
     loadData () {
       return this.showDisable ? this.rightData.filter(item => item.productEnableFlag == 0) : this.rightData
     }
@@ -162,10 +163,12 @@ export default {
     getData () {
       const paramsData = JSON.parse(JSON.stringify(this.paramsData))
       this.rightData = paramsData.okList || []
+      // 正确数据
       this.rightData.map((item, index) => {
         item.no = index + 1
         item.sparePartsPurchaseSn = paramsData.sparePartsPurchaseSn
       })
+      // 不可导入数据
       this.unLoadData = paramsData.errorList || []
       this.unLoadData.map((item, index) => {
         item.no = index + 1
@@ -191,7 +194,7 @@ export default {
         }
       }
     },
-    // 导出
+    // 导出错误项
     handleError () {
       const _this = this
       if (_this.paramsData.errorList.length < 1) {

+ 4 - 20
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -74,23 +74,6 @@
           </a-collapse-panel>
         </a-collapse>
       </a-card>
-      <!-- 单据记录  二期 -->
-      <!-- <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="单据记录">
-            <a-timeline class="timeline-box">
-              <a-timeline-item>2021-02-01 15:22:38   王凯   审核通过</a-timeline-item>
-              <a-timeline-item>
-                <p>2021-02-01 15:22:38   王凯   审核通过</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-              </a-timeline-item>
-              <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
-              <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
-            </a-timeline>
-          </a-collapse-panel>
-        </a-collapse>
-      </a-card> -->
     </a-spin>
   </div>
 </template>
@@ -149,12 +132,13 @@ export default {
           return data
         })
       },
-      localDataSource: [],
+      localDataSource: [], // 列表原始数据
       basicInfoData: null, //  基本信息
       productTotal: null //  合计
     }
   },
   computed: {
+    // 是否可编辑
     isEdit () {
       return this.basicInfoData && this.basicInfoData.state != 'FINISH' && this.$hasPermissions('B_bulkWarehousingOrder_edit')
     }
@@ -162,7 +146,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
+      this.$router.push({ name: 'bulkWarehousingOrderList' })
     },
     // 打印预览/快捷打印
     handlePrint (type, printerType) {
@@ -197,7 +181,7 @@ export default {
     },
     //  编辑
     handleEdit () {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${this.basicInfoData.id}/${this.basicInfoData.sparePartsPurchaseSn}/${this.basicInfoData.supplierSn}` })
+      this.$router.push({ name: 'bulkWarehousingOrderEdit', params: { id: this.basicInfoData.id, sn: this.basicInfoData.sparePartsPurchaseSn, supplierSn: this.basicInfoData.supplierSn } })
     }
   },
   mounted () {

+ 33 - 29
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -66,7 +66,7 @@
                     <template v-if="advanced">
                       <a-col :md="6" :sm="24">
                         <a-form-item label="产品分类">
-                          <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
+                          <ProductType id="bulkWarehousingOrderEdit-productType" @change="changeProductType" v-model="productType"></ProductType>
                         </a-form-item>
                       </a-col>
                       <a-col :md="6" :sm="24">
@@ -78,7 +78,7 @@
                     <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
-                      <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
+                      <a @click="advanced=!advanced" style="margin:0 30px 0 10px" id="bulkWarehousingOrderEdit-advanced">
                         {{ advanced ? '收起' : '展开' }}
                         <a-icon :type="advanced ? 'up' : 'down'"/>
                       </a>
@@ -103,7 +103,7 @@
                   <div @dblclick.stop>
                     <a-input-number
                       size="small"
-                      id="bulkWarehousingOrderEdit-putCost"
+                      :id="'bulkWarehousingOrderEdit-putCost-'+record.id"
                       v-model="record.putCost"
                       :precision="2"
                       :min="0"
@@ -119,7 +119,7 @@
                     <a-input-number
                       size="small"
                       @dblclick.stop
-                      id="bulkWarehousingOrderEdit-putQty"
+                      :id="'bulkWarehousingOrderEdit-putQty-'+record.id"
                       v-model="record.putQty"
                       :precision="0"
                       :min="1"
@@ -139,7 +139,7 @@
                       :allowClear="false"
                       :options="warehouseCascadeData"
                       :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
-                      id="bulkWarehousingOrderEdit-warehouseCascade"
+                      :id="'bulkWarehousingOrderEdit-warehouseCascade-'+record.id"
                       placeholder="请选择仓库仓位"
                       style="width: 100%;" />
                   </div>
@@ -175,17 +175,17 @@
                   <a-row :gutter="15">
                     <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品编码">
-                        <a-input id="bulkWarehousingOrderEdit-code" v-model.trim="queryChooseParam.productCode" allowClear placeholder="请输入产品编码"/>
+                        <a-input id="chooseTable-code" v-model.trim="queryChooseParam.productCode" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                     </a-col>
                     <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品名称">
-                        <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryChooseParam.productName" allowClear placeholder="请输入产品名称"/>
+                        <a-input id="chooseTable-name" v-model.trim="queryChooseParam.productName" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                     </a-col>
                     <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
-                      <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-refresh">查询</a-button>
-                      <a-button style="margin-left: 8px" @click="resetChooseSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-reset">重置</a-button>
+                      <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="chooseTable-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="resetChooseSearchForm" :disabled="disabled" id="chooseTable-reset">重置</a-button>
                     </a-col>
                     <a-col :md="3" :sm="24">
                     </a-col>
@@ -194,7 +194,7 @@
                         type="default"
                         @click="openGuideModal=true"
                         :loading="delLoading"
-                        id="bulkWarehousingOrderEdit-del-all">导入产品</a-button>
+                        id="chooseTable-import">导入产品</a-button>
                       <a-button
                         type="primary"
                         ghost
@@ -202,7 +202,7 @@
                         style="margin-left: 10px"
                         @click="delBulkOrder"
                         :loading="delLoading"
-                        id="bulkWarehousingOrderEdit-del-all">清空列表</a-button>
+                        id="chooseTable-del-all">清空列表</a-button>
                     </a-col>
                   </a-row>
                 </a-form>
@@ -222,7 +222,7 @@
                 <template slot="putCost" slot-scope="text, record">
                   <a-input-number
                     size="small"
-                    id="bulkWarehousingOrderEdit-choose-putCost"
+                    :id="'chooseTable-putCost-'+record.id"
                     v-model="record.putCost"
                     :precision="2"
                     :min="0"
@@ -236,7 +236,7 @@
                 <template slot="putQty" slot-scope="text, record">
                   <a-input-number
                     size="small"
-                    id="bulkWarehousingOrderEdit-choose-putQty"
+                    :id="'chooseTable-putQty-'+record.id"
                     v-model="record.putQty"
                     :precision="0"
                     :min="1"
@@ -255,13 +255,13 @@
                     :allowClear="false"
                     :options="warehouseCascadeData"
                     :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
-                    id="bulkWarehousingOrderEdit-choose-warehouseCascade"
+                    :id="'chooseTable-warehouseCascade-'+record.id"
                     placeholder="请选择仓库仓位"
                     style="width: 100%;" />
                 </template>
                 <!-- 操作 -->
                 <template slot="action" slot-scope="text, record">
-                  <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
+                  <a-button size="small" type="link" class="button-error" @click="handleDel(record)" :id="'chooseTable-del-'+record.id">删除</a-button>
                 </template>
               </s-table>
             </div>
@@ -335,28 +335,27 @@ export default {
   data () {
     const _this = this
     return {
-      isShowBisiceInfo: false,
-      advanced: false,
+      isShowBisiceInfo: false, // 是否显示基础信息
+      advanced: false, // 展开收起
       spinning: false,
       loading: false,
-      delLoading: false,
-      chooseLoading: false,
-      showNewProduct: false,
-      openGuideModal: false,
+      delLoading: false, // 删除按钮loading
+      showNewProduct: false, // 新增产品弹框
+      openGuideModal: false, // 导入产品弹框
       queryParam: {
         code: '', //  产品编码
         name: '', //  产品名称
         origCode: '', //  原厂编码
-        productBrandSn: undefined,
-        productTypeSn1: undefined,
-        productTypeSn2: undefined,
-        productTypeSn3: undefined
+        productBrandSn: undefined, // 产品品牌sn
+        productTypeSn1: undefined, // 产品分类1sn
+        productTypeSn2: undefined, // 产品分类2sn
+        productTypeSn3: undefined // 产品分类3sn
       },
       queryChooseParam: {
         productCode: '', //  产品编码
         productName: '' //  产品名称
       },
-      productType: [],
+      productType: [], // 产品分类默认值
       warehouseCascadeData: [], //  仓库仓位
       disabled: false, //  查询、重置按钮是否可操作
       paramsData: null, // 新增产品临时参数
@@ -385,6 +384,7 @@ export default {
             data.list[i].no = no + i + 1
             data.list[i].putCost = data.list[i].purchasePrice
             data.list[i].putQty = data.list[i].putQty || 1
+            // 默认仓库仓位
             if (this.defaultWarehouseCascade.length > 0) {
               data.list[i].warehouseCascade = this.defaultWarehouseCascade
               data.list[i].warehouseSn = this.defaultWarehouseCascade[0]
@@ -434,6 +434,7 @@ export default {
             data.list[i].no = no + i + 1
             data.list[i].putCostBackups = data.list[i].putCost
             data.list[i].putQtyBackups = data.list[i].putQty
+            // 默认仓库仓位
             const warehouseSn = data.list[i].warehouseSn || undefined
             const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
             if (warehouseSn || warehouseLocationSn) {
@@ -450,8 +451,8 @@ export default {
           return data
         })
       },
-      loadDataSource: [],
-      chooseLoadDataSource: [],
+      loadDataSource: [], // 产品列表原始数据
+      chooseLoadDataSource: [], // 已选产品列表原始数据
       warehouseList: [], //  仓库  下拉数据
       warehouseLocList: {}, //  仓位  下拉数据
       defaultWarehouseCascade: [], //  默认仓库仓位
@@ -680,7 +681,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
+      this.$router.push({ name: 'bulkWarehousingOrderList' })
     },
     // 合计
     getDetailCount (params) {
@@ -692,6 +693,7 @@ export default {
         }
       })
     },
+    // 选择仓库仓位
     changeWarehouseCascade (val, opt, ind, type) {
       let loadData
       if (type == 'dealerProduct') { //  全部产品
@@ -699,6 +701,7 @@ export default {
       } else if (type == 'sparePartsPurDetail') { //  已选产品
         loadData = this.chooseLoadDataSource[ind]
       }
+      // 如果仓库无仓位
       if (val.length < 2) {
         this.$message.warning('当前仓库无仓位,请选择其他仓库')
         const warehouseSnBackups = loadData.warehouseSnBackups || undefined
@@ -781,6 +784,7 @@ export default {
         this.spinning = false
       })
     },
+    // 页面初始化
     initPage () {
       this.getWarehouseCascade()
       this.getDetail()

+ 5 - 5
src/views/bulkManagement/bulkWarehousingOrder/importGuideModal.vue

@@ -18,7 +18,7 @@
             <li>1) 导入的Excel文件中必须包含名为“产品编码”、“成本价”、“数量”、“仓库”、“仓位”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
             <li>
-              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+              <a :href="filePath" id="importGuide-tpl" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板
               </a>
             </li>
@@ -77,7 +77,7 @@ export default {
       type: Boolean,
       default: false
     },
-    params: {
+    params: { // 参数
       type: Object,
       default: null
     }
@@ -88,11 +88,11 @@ export default {
       openImportModal: false, //  导入
       attachAction: process.env.VUE_APP_API_BASE_URL + '/sparePartsPur/detail/import',
       paramsData: null,
-      uploadParams: {
+      uploadParams: { // 上传参数
         savePathType: 'local',
         sparePartsPurchaseSn: this.params.sparePartsPurchaseSn
       },
-      filePath: location.protocol + '//' +location.host + '/templ/散件入库产品导入模板.xlsx'
+      filePath: location.protocol + '//' + location.host + '/templ/散件入库产品导入模板.xlsx' // 模板地址
     }
   },
   methods: {
@@ -129,7 +129,7 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
+    }
   },
   watch: {
     //  父页面传过来的弹框状态

+ 21 - 25
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -7,12 +7,12 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate id="bulkWarehousingOrderList-rangeDate" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="入库时间">
-                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+                <rangeDate id="bulkWarehousingOrderList-auditRangeDate" ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -69,7 +69,7 @@
                   :loading="exportLoading"
                   v-if="$hasPermissions('B_bulkWarehousingOrder_export')"
                   id="bulkWarehousingOrderList-export">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px">
+                <a @click="advanced=!advanced" style="margin-left: 5px" id="bulkWarehousingOrderList-advanced">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
@@ -104,7 +104,7 @@
         bordered>
         <!-- 散件单号 -->
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_bulkWarehousingOrder_detail')" class="table-td-link" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
+          <span :id="'bulkWarehousingOrderList-detail-'+record.id" v-if="$hasPermissions('B_bulkWarehousingOrder_detail')" class="table-td-link" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
           <span v-else>{{ record.sparePartsPurchaseNo }}</span>
         </template>
         <!-- 提交 -->
@@ -127,21 +127,21 @@
             v-if="record.state != 'FINISH' && $hasPermissions('B_bulkWarehousingOrder_edit')"
             @click="handleEdit(record)"
             class="button-primary"
-            id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
+            :id="'bulkWarehousingOrderList-edit-'+record.id">编辑</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_PUT_WAREHOUSE' && $hasPermissions('B_bulkWarehousingOrder_put')"
             @click="handleWarehouse(record)"
             class="button-primary"
-            id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
+            :id="'bulkWarehousingOrderList-in-'+record.id">入库</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state != 'FINISH' && $hasPermissions('B_bulkWarehousingOrder_del')"
             @click="handleDel(record)"
             class="button-error"
-            id="bulkWarehousingOrderList-del-btn">删除</a-button>
+            :id="'bulkWarehousingOrderList-del-'+record.id">删除</a-button>
           <span v-if="(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_edit')) &&(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_del')) &&(record.state != 'WAIT_PUT_WAREHOUSE' || !$hasPermissions('B_bulkWarehousingOrder_put'))">--</span>
         </template>
       </s-table>
@@ -174,17 +174,17 @@ export default {
       exportLoading: false, // 导出loading
       openModal: false, // 基本信息弹框是否显示
       tableHeight: 0,
-      time: [
+      time: [ // 默认时间
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
-      auditTime: [],
+      auditTime: [], // 审核时间默认值
       // 查询参数
       queryParam: {
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        auditBeginDate: '',
-        auditEndDate: '',
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
+        auditBeginDate: '', // 审核开始时间
+        auditEndDate: '', // 审核结束时间
         sparePartsPurchaseNo: '', //  散件单号
         supplierSn: undefined, //  供应商
         state: undefined, //  单据状态
@@ -226,7 +226,7 @@ export default {
           return data
         })
       },
-      productTotal: null,
+      productTotal: null, // 统计数据
       dataTotalCount: 0 //  列表数据总条数
     }
   },
@@ -236,6 +236,7 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    // 审核时间
     auditDateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]
@@ -250,22 +251,22 @@ export default {
         }
       })
     },
-    //  新增
+    //  新增弹框
     handleAdd () {
       this.openModal = true
     },
     //  基本信息  保存
     handleOk (row) {
       this.resetData()
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
+      this.$router.push({ name: 'bulkWarehousingOrderAdd', params: { id: row.id, sn: row.sparePartsPurchaseSn, supplierSn: row.supplierSn } })
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
+      this.$router.push({ name: 'bulkWarehousingOrderEdit', params: { id: row.id, sn: row.sparePartsPurchaseSn, supplierSn: row.supplierSn } })
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/detail/${row.id}/${row.sparePartsPurchaseSn}` })
+      this.$router.push({ name: 'bulkWarehousingOrderDetail', params: { id: row.id, sn: row.sparePartsPurchaseSn } })
     },
     //  入库
     handleWarehouse (row) {
@@ -330,12 +331,6 @@ export default {
         this.setIsHomeNav(this.$route.name, null)
       }
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
-        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     //  导出
     handleExport () {
       const _this = this
@@ -360,6 +355,7 @@ export default {
         }
       })
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -373,7 +369,6 @@ export default {
       const b = this.$store.state.app.updateList
       // 是否从首页点击进入
       const isHomeNav = this.getIsHomeNav()[this.$route.name]
-      console.log(a, b, this.getIsHomeNav(), isHomeNav, this.$route.name)
 
       // 从首页进入,判断式新建还式待办查询
       if (isHomeNav) {
@@ -400,6 +395,7 @@ export default {
         }
       }
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270