lilei 11 月之前
父节点
当前提交
47a661f7c4

+ 1 - 1
public/version.json

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

+ 18 - 13
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="盘点完成时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="inventoryCheckAuditList-checkTime" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -38,7 +38,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="checkWarehouseNo" slot-scope="text, record">
-          <span class="table-td-link" v-if="$hasPermissions('B_inventoryCheckingDetail')" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</span>
+          <span class="table-td-link" :id="'inventoryCheckAuditList-detail-'+record.id" v-if="$hasPermissions('B_inventoryCheckingDetail')" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</span>
           <span v-else>{{ record.checkWarehouseNo }}</span>
         </template>
         <!-- 盈亏数量 -->
@@ -57,10 +57,12 @@
             type="link"
             class="button-primary"
             @click="handleOk(record, true)"
-            id="warehousingAudit-adopt-btn">通过</a-button>
+            :id="'inventoryCheckAuditList-adopt-'+record.id"
+          >通过</a-button>
           <a-button
             size="small"
             type="link"
+            :id="'inventoryCheckAuditList-checkAgain-'+record.id"
             v-if="record.state == 'WAIT_FINANCE_AUDIT' && $hasPermissions('B_inventoryCheckingAgain')"
             class="button-error"
             @click="handleAgain(record)"
@@ -92,12 +94,12 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       // 查询参数
       queryParam: {
-        beginDate: undefined,
-        endDate: undefined,
-        checkWarehouseNo: ''
+        beginDate: undefined, // 开始时间
+        endDate: undefined, // 结束时间
+        checkWarehouseNo: '' // 盘点单号
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -118,10 +120,10 @@ export default {
           return data
         })
       },
-      productTotal: null,
-      openDetailModal: false,
-      openCostPriceModal: false,
-      itemSn: null
+      productTotal: null, // 统计信息
+      openDetailModal: false, // 详情
+      openCostPriceModal: false, // 设置成本价弹框
+      itemSn: null // 当前操作数据
     }
   },
   computed: {
@@ -153,18 +155,19 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
-    //  详情
+    //  打开详情弹框
     handleDetail (row) {
       this.itemSn = row.checkWarehouseSn
       this.openDetailModal = true
     },
+    // 详情弹框关闭
     handleDetailClose () {
       this.itemSn = null
       this.openDetailModal = false
     },
+    // 设置成本价成功
     handleOk (row, type) {
       queryStockProductCostNull({ checkWarehouseSn: row.checkWarehouseSn }).then(res => {
-        console.log(res)
         // 设置成本价
         if (res.data.length) {
           // 如果有盈亏的产品,没有最近一次入库成本价,需要设置成本价
@@ -227,12 +230,14 @@ export default {
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195

+ 8 - 6
src/views/financialManagement/inventoryCheckAudit/setPriceModal.vue

@@ -26,6 +26,7 @@
           bordered>
           <template slot="action" slot-scope="text,record">
             <a-input-number
+              :id="'setPrice-const-'+record.id"
               style="width: 100%;"
               size="small"
               v-model="record.lastStockCost"
@@ -38,8 +39,8 @@
         </a-table>
       </div>
       <div class="btn-cont">
-        <a-button type="primary" @click="handleSubmit">保存</a-button>
-        <a-button @click="cancel" style="margin-left: 15px;">取消</a-button>
+        <a-button id="setPrice-save" type="primary" @click="handleSubmit">保存</a-button>
+        <a-button id="setPrice-cancel" @click="cancel" style="margin-left: 15px;">取消</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -57,7 +58,7 @@ export default {
       type: Boolean,
       default: false
     },
-    title: {
+    title: { // 标题
       type: String,
       default: '设置成本价'
     }
@@ -65,10 +66,10 @@ export default {
   data () {
     return {
       spinning: false,
-      confirmLoading: false,
+      confirmLoading: false, // 确认按钮loading
       isShow: this.openModal, //  是否打开弹框
-      row: null,
-      list: [],
+      row: null, // 当前操作数据
+      list: [], // 列表数据
       // 表头
       columns: [
         { title: '产品编码', dataIndex: 'productCode', width: '30%', align: 'center', customRender: function (text) { return ((text || text != ' ') ? text : '--') } },
@@ -98,6 +99,7 @@ export default {
         _this.$emit('ok', _this.row, true)
       })
     },
+    // 取消
     cancel () {
       this.isShow = false
     },

+ 3 - 1
src/views/financialManagement/warehousingAudit/detail.vue

@@ -97,7 +97,7 @@ export default {
           return data
         })
       },
-      localDataSource: [],
+      localDataSource: [], // 列表数据
       basicInfoData: null, //  基本信息
       printerType: 'NEEDLE' //  打印机类型
     }
@@ -118,6 +118,7 @@ export default {
         { title: '仓库', dataIndex: 'warehouseEntity.name', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
+      // 成本价权限
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(7, 0, { title: '成本价', dataIndex: 'discountedPrice', width: '7%', align: 'right', scopedSlots: { customRender: 'unitPrice' } })
         arr.splice(8, 0, { title: '入库小计', dataIndex: 'realPutAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -141,6 +142,7 @@ export default {
         _this.spinning = false
       })
     },
+    // 获取详情
     getDetail () {
       receivingDetailSn({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {

+ 12 - 14
src/views/financialManagement/warehousingAudit/list.vue

@@ -17,7 +17,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="入库时间">
-                <rangeDate ref="rangeDate" :value="auditTime" @change="dateChange" />
+                <rangeDate id="warehousingAuditList-auditTime" ref="rangeDate" :value="auditTime" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -36,10 +36,6 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingAuditList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="warehousingAuditList-reset">重置</a-button>
-                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a> -->
               </span>
             </a-col>
           </a-row>
@@ -99,7 +95,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import moment from 'moment'
 import getDate from '@/libs/getDate'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -114,18 +109,18 @@ export default {
       spinning: false,
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
-      auditTime: [
+      auditTime: [ // 审核时间默认值
         getDate.getThreeMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ], //  入库时间
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       // 查询参数
       queryParam: {
-        beginDate: getDate.getThreeMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        purchaseBillNo: '',
-        receivingBillNo: '',
-        auditState: 'WAIT_PUT_WAREHOUSE_AUDIT'
+        beginDate: getDate.getThreeMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
+        purchaseBillNo: '', // 采购单号
+        receivingBillNo: '', // 发货单号
+        auditState: 'WAIT_PUT_WAREHOUSE_AUDIT'// 审核状态
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -154,7 +149,7 @@ export default {
           return data
         })
       },
-      productTotal: null
+      productTotal: null // 统计
     }
   },
   computed: {
@@ -173,6 +168,7 @@ export default {
         // { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
+      // 成本价权限
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(5, 0, { title: '入库总成本', dataIndex: 'totalRealPutAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
@@ -236,12 +232,14 @@ export default {
       this.queryParam.receivingBillNo = ''
       this.queryParam.auditState = flag ? '' : 'WAIT_PUT_WAREHOUSE_AUDIT'
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 238

+ 6 - 7
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -170,13 +170,13 @@ export default {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
-      time: [
+      time: [ // 时间默认值
         moment(getDate.getCurrMonthDays().starttime),
         moment(getDate.getCurrMonthDays().endtime)
       ],
       queryParam: { //  查询条件
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         outBizNo: undefined, //  出库单号
         demanderNameCurrent: undefined, //  单位名称
         outBizType: undefined, //  出库类型
@@ -220,10 +220,10 @@ export default {
           return data
         })
       },
-      openModal: false,
-      orderSn: undefined,
+      openModal: false, // 详情弹框
+      orderSn: undefined, // 单据sn
       outBizType: null, //  当前单子类型   SALES销售出库        ALLOCATE调拨出库
-      rowSelectionInfo: null,
+      rowSelectionInfo: null, // 已选择数据
       showUniqueCode: false// 抓取唯一码弹窗
     }
   },
@@ -399,7 +399,6 @@ export default {
   activated () {
     // 是否从首页点击进入
     const isHomeNav = this.getIsHomeNav()[this.$route.name]
-    console.log(this.getIsHomeNav(), isHomeNav, this.$route.name)
     this.pageInit()
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {