Browse Source

添加id和注释

chenrui 11 months ago
parent
commit
c320e117df

+ 29 - 25
src/views/purchasingManagement/purchaseReceipt/addModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     centered
-    class="bulkWarehousingOrder-product-modal"
+    class="purchaseReceipt-product-modal"
     :footer="null"
     :maskClosable="false"
     :title="(itemSn ? '编辑' : '新增') + '产品'"
@@ -10,7 +10,7 @@
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
-        id="bulkWarehousingOrder-product-form"
+        id="purchaseReceipt-product-form"
         ref="ruleForm"
         :model="form"
         :rules="rules"
@@ -21,7 +21,7 @@
         <a-form-model-item label="产品编码" :prop="!itemSn?'productSn':''">
           <a-select
             show-search
-            id="bulkWarehousingOrder-product-productSn"
+            id="purchaseReceipt-product-productSn"
             ref="productSn"
             v-if="!itemSn"
             v-model="form.productSn"
@@ -42,7 +42,7 @@
         <a-form-model-item label="仓库仓位" prop="warehouseLocationSn">
           {{ (nowData&&nowData.warehouseName) || '--' }} >
           <a-select
-            id="bulkWarehousingOrder-product-warehouse"
+            id="purchaseReceipt-product-warehouse"
             @change="changeWarehouseCascade"
             placeholder="请选择仓位"
             :allowClear="false"
@@ -58,7 +58,7 @@
         </a-form-model-item>
         <a-form-model-item label="采购数量" prop="productQty">
           <a-input-number
-            id="bulkWarehousingOrder-product-productQty"
+            id="purchaseReceipt-product-productQty"
             ref="productQty"
             v-model="form.productQty"
             :precision="0"
@@ -68,8 +68,8 @@
             style="width: 50%;margin-right:20px;" /><span>个</span>
         </a-form-model-item>
         <div class="btn-cont">
-          <a-button id="bulkWarehousingOrder-product-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
-          <a-button type="primary" id="bulkWarehousingOrder-product-modal-save" @click="handleSave">{{ itemSn?'保存':'保存并新增' }}</a-button>
+          <a-button id="purchaseReceipt-product-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+          <a-button type="primary" id="purchaseReceipt-product-modal-save" @click="handleSave">{{ itemSn?'保存':'保存并新增' }}</a-button>
         </div>
       </a-form-model>
     </a-spin>
@@ -78,13 +78,15 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { VSelect } from '@/components'
 import debounce from 'lodash/debounce'
+// 组件
+import { VSelect } from '@/components'
+// 接口
 import { supplierProductList } from '@/api/supplier'
 import { warehouseCascadeList } from '@/api/warehouse'
 import { savePurchaseDetail, getDetailData } from '@/api/purchase'
 export default {
-  name: 'BulkWarehousingOrderBasicInfoModal',
+  name: 'PurchaseReceiptAddModal',
   mixins: [commonMixin],
   components: { VSelect },
   props: {
@@ -106,24 +108,26 @@ export default {
   data () {
     this.fetchUser = debounce(this.fetchUser, 800)
     return {
-      isShow: this.openModal, //  是否打开弹框
       spinning: false,
+      isShow: this.openModal, //  是否打开弹框
+      // form 表单设置
       formItemLayout: {
         labelCol: { span: 5 },
         wrapperCol: { span: 16 }
       },
       form: {
         supplierSn: '', // 供应商
-        productSn: undefined,
-        productName: '',
-        productCode: '',
-        productOrigCode: '',
-        warehouseSn: '',
-        warehouseLocationSn: undefined,
-        productCost: '',
-        productQty: ''
+        productSn: undefined, // 产品sn
+        productName: '', // 产品名称
+        productCode: '', // 产品编码
+        productOrigCode: '', // 产品原厂编码
+        warehouseSn: '', // 仓库
+        warehouseLocationSn: undefined, // 仓位
+        productCost: '', // 产品成本价
+        productQty: ''// 产品数量
       },
-      productCost: '',
+      productCost: '', // 成本价
+      // 必填项规则验证
       rules: {
         productSn: [
           { required: true, message: '请选择产品编码', trigger: 'change' }
@@ -138,12 +142,11 @@ export default {
           { required: true, message: '请输入数量', trigger: 'blur' }
         ]
       },
-      fetching: false,
-      productData: [],
+      fetching: false, // 当下拉列表为空时显示的内容
+      productData: [], // 产品信息
       warehouseCascadeData: [], //  仓库仓位  下拉数据
       warehouseSnBackups: '', //  仓库备份数据
-      warehouseLocationSnBackups: '', //  仓位备份数据
-      isGift: false
+      warehouseLocationSnBackups: '' //  仓位备份数据
     }
   },
   methods: {
@@ -178,7 +181,6 @@ export default {
       this.form.productCost = this.productData[ind].cost
       this.productCost = this.form.productCost
       this.form.productQty = ''
-      this.isGift = false
       this.$refs.productQty.focus()
       this.$refs.ruleForm.validate()
     },
@@ -223,6 +225,7 @@ export default {
         }
       })
     },
+    // 选择仓位
     changeWarehouseCascade (val) {
       this.$refs.productQty.focus()
       this.$refs.ruleForm.validate()
@@ -248,6 +251,7 @@ export default {
         }
       })
     },
+    // 重置
     resetData () {
       this.$refs.ruleForm.resetFields()
       this.form = {
@@ -289,7 +293,7 @@ export default {
 </script>
 
 <style lang="less">
-  .bulkWarehousingOrder-product-modal{
+  .purchaseReceipt-product-modal{
     .ant-modal-body {
       padding: 40px 40px 24px;
       .ant-form-item{

+ 13 - 15
src/views/purchasingManagement/purchaseReceipt/basicInfoModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     centered
-    class="purchaseReturn-basicInfo-modal"
+    class="purchaseReceipt-basicInfo-modal"
     :footer="null"
     :maskClosable="false"
     :title="itemSn?'编辑':'新增'"
@@ -10,35 +10,31 @@
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
-        id="purchaseReturn-basicInfo-form"
+        id="purchaseReceipt-basicInfo-form"
         ref="ruleForm"
         :model="form"
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
+        <!-- pageSn="544577718475575296" 只显示福麦斯供应商-->
         <a-form-model-item label="供应商名称" prop="supplierSn">
-          <supplier v-model="form.supplierSn"  enableFlag="1" pageSn="544577718475575296" isPermission placeholder="请输入供应商名称"></supplier>
+          <supplier v-model="form.supplierSn" enableFlag="1" pageSn="544577718475575296" isPermission placeholder="请输入供应商名称"></supplier>
         </a-form-model-item>
         <a-form-model-item label="仓库仓位" prop="warehouseSn">
           <a-select
             v-if="warehouseCascadeData && warehouseCascadeData.length>0"
-            id="purchaseReturn-basicInfo-warehouseSn"
+            id="purchaseReceipt-basicInfo-warehouseSn"
             @change="changeWarehouse"
             placeholder="请选择仓库"
             :allowClear="false"
             v-model="form.warehouseSn"
             style="width: 49%;margin-right:1%;">
-            <a-select-option
-              v-for="
-                item
-                  in
-                    warehouseCascadeData"
-              :value="item.warehouseSn">
+            <a-select-option v-for="item in warehouseCascadeData" :value="item.warehouseSn">
               {{ item.name }}
             </a-select-option>
           </a-select>
           <a-select
-            id="purchaseReturn-basicInfo-warehouseLocationSn"
+            id="purchaseReceipt-basicInfo-warehouseLocationSn"
             placeholder="请选择仓位"
             :allowClear="false"
             v-model="form.warehouseLocationSn"
@@ -60,8 +56,8 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button id="purchaseReturn-basicInfo-modal-back" @click="isShow = false">取消</a-button>
-        <a-button style="margin-left: 15px;" type="primary" id="purchaseReturn-modal-save" @click="handleSave">确定</a-button>
+        <a-button id="purchaseReceipt-basicInfo-modal-cancle" @click="isShow = false">取消</a-button>
+        <a-button style="margin-left: 15px;" type="primary" id="purchaseReceipt-basicInfo-modal-save" @click="handleSave">确定</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -96,8 +92,9 @@ export default {
   },
   data () {
     return {
-      isShow: this.openModal, //  是否打开弹框
       spinning: false,
+      isShow: this.openModal, //  是否打开弹框
+      // form 表单样式设置
       formItemLayout: {
         labelCol: { span: 5 },
         wrapperCol: { span: 16 }
@@ -109,6 +106,7 @@ export default {
         warehouseSn: undefined, // 仓库
         warehouseLocationSn: undefined // 仓位
       },
+      // 表单验证规则
       rules: {
         supplierSn: [
           { required: true, message: '请选择供应商名称', trigger: 'change' }
@@ -188,7 +186,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .purchaseReturn-basicInfo-modal{
+  .purchaseReceipt-basicInfo-modal{
     .ant-modal-body {
       padding: 40px 40px 24px;
     }

+ 5 - 4
src/views/purchasingManagement/purchaseReceipt/chooseImportModal.vue

@@ -92,7 +92,7 @@ export default {
         { title: '产品名称', dataIndex: 'productName', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
-      loadData: [],
+      loadData: [], // 可导入数据
       nowUnColumns: [
         { title: '序号', dataIndex: 'no', width: '9%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -100,11 +100,12 @@ export default {
         { title: '数量', dataIndex: 'qtyText', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '备注', dataIndex: 'errorDesc', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
-      unLoadData: [],
-      loading: false
+      unLoadData: [], // 不可导入数据
+      loading: false// 表格加载状态
     }
   },
   methods: {
+    // 解析文件导入数据
     getData () {
       const _this = this
       this.loading = true
@@ -139,7 +140,7 @@ export default {
         this.isShow = false
       }
     },
-    // 导出
+    // 导出错误项
     handleError () {
       const _this = this
       if (_this.unLoadData.length < 1) {

+ 7 - 10
src/views/purchasingManagement/purchaseReceipt/detailModal.vue

@@ -12,9 +12,7 @@
       <!-- 基础信息 -->
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
-          <template slot="header">
-            基础信息
-          </template>
+          <template slot="header">基础信息</template>
           <a-descriptions :column="3">
             <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="入库仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
@@ -44,9 +42,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-tooltip placement="bottom" v-if="record.traceCodeQty*1!=record.productQty*1">
-            <template slot="title">
-              <span>唯一码数量与采购数量不一致</span>
-            </template>
+            <template slot="title"><span>唯一码数量与采购数量不一致</span></template>
             <a-button
               size="small"
               type="link"
@@ -81,10 +77,8 @@ import { commonMixin } from '@/utils/mixin'
 // 组件
 import { STable, VSelect } from '@/components'
 import uniqueCodeModal from './uniqueCodeModal.vue'
-
 // 接口
 import { purchaseDetailPageList, queryDetailCount, purchaseDetailPageCount } from '@/api/purchase'
-
 export default {
   name: 'DetailModal',
   mixins: [commonMixin],
@@ -105,7 +99,7 @@ export default {
       basicInfoData: null, //  基础信息数据
       statisticsObj: null, //  统计数据
       openUniqueCodeModal: false, // 轮胎唯一码弹窗
-      itemUniqueCodeData: null,
+      itemUniqueCodeData: null, // 轮胎唯一码列表请求数据
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const params = Object.assign(parameter, { sparePartsSn: this.itemSn })
@@ -116,7 +110,8 @@ export default {
             // 获取基础信息数据
             this.getBasicsData()
             // 获取统计数据
-            this.getDetailCount()
+            this.getDetailCount(params)
+            // 计算列表序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -155,10 +150,12 @@ export default {
     }
   },
   methods: {
+    // 打开唯一码弹窗
     handleCheck (row) {
       this.itemUniqueCodeData = { purchaseNo: row.sparePartsNo, productCode: row.productCode, productSn: row.productSn }
       this.openUniqueCodeModal = true
     },
+    // 关闭唯一码弹窗
     closeUniqueCodeModal () {
       this.itemUniqueCodeData = null
       this.openUniqueCodeModal = false

+ 2 - 7
src/views/purchasingManagement/purchaseReceipt/edit.vue

@@ -86,7 +86,7 @@
               v-if="$hasPermissions('B_purchaseReceiptEdit_edit')"
               @click="handleAddEdit(record)"
               class="button-info"
-              id="purchaseReceiptEdit-edit-btn">编辑</a-button>
+              :id="'purchaseReceiptEdit-edit-btn'+record.id">编辑</a-button>
             <a-button
               size="small"
               type="link"
@@ -94,7 +94,7 @@
               class="button-error"
               v-if="$hasPermissions('B_purchaseReceiptEdit_del')"
               @click="handleDel(record)"
-              id="purchaseReceiptEdit-del-btn">删除</a-button>
+              :id="'purchaseReceiptEdit-del-btn'+record.id">删除</a-button>
           </template>
         </s-table>
       </a-card>
@@ -138,7 +138,6 @@ import { STable, VSelect } from '@/components'
 import addModal from './addModal.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import importGuideModal from './importGuideModal.vue'
-
 // 接口
 import { purchaseDetailPageList, queryDetailCount, purchaseDetailDel, purchaseSubmit, purchaseImportBatchInsert, purchaseDetailPageCount } from '@/api/purchase'
 import { getThirdStockQty } from '@/api/salesNew'
@@ -157,19 +156,15 @@ export default {
       detailsData: null, // 基础信息数据
       addMoreLoading: false, // 防止多次添加  加载状态
       loading: false, // 第三方库存按钮加载状态
-
       // 查询参数
       productForm: {
         productCode: '', // 产品编码
         productName: '' // 产品名称
       },
       statisticsObj: undefined, // 统计明细
-
       sparePartsSn: undefined, // 采购入库sn
       itemSn: undefined, // 列表行 sn
-
       itemObj: null, // 基础信息弹窗回显数据
-
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.productForm.sparePartsSn = this.sparePartsSn

+ 5 - 5
src/views/purchasingManagement/purchaseReceipt/importGuideModal.vue

@@ -66,6 +66,7 @@
 </template>
 
 <script>
+// 组件
 import ChooseImportModal from './chooseImportModal.vue'
 import { Upload } from '@/components'
 export default {
@@ -85,13 +86,12 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/upload',
-      paramsData: null,
-      uploadParams: {
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/upload', // 上传文件地址
+      paramsData: null, // 上传文件参数
+      uploadParams: {// 添加文件参数
         savePathType: 'local'
       },
-      exportLoading: false,
-      filePath: location.protocol + '//' + location.host + '/templ/采购产品导入模板.xlsx'
+      filePath: location.protocol + '//' + location.host + '/templ/采购产品导入模板.xlsx' // 模板下载地址
     }
   },
   methods: {

+ 1 - 1
src/views/purchasingManagement/purchaseReceipt/uniqueCodeModal.vue

@@ -38,7 +38,7 @@ import { STable } from '@/components'
 // 接口
 import { traceCodeQueryList } from '@/api/purchase'
 export default {
-  name: 'BulkWarehousingOrderDetailModal',
+  name: 'UniqueCodeModal',
   mixins: [commonMixin],
   components: { STable },
   props: {

+ 6 - 4
src/views/purchasingManagement/purchaseReceipt/uploadVoucherModal.vue

@@ -8,10 +8,10 @@
     v-model="isShow"
     @cancel="isShow=false"
     :width="420">
+    <!-- 上传支付凭证 -->
     <div class="uploadVoucher-con">
       <a-form-model
         ref="ruleForm"
-        :model="form"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol"
       >
@@ -49,7 +49,9 @@
 </template>
 
 <script>
+// 组件
 import { Upload } from '@/components'
+// 接口
 import { saveAttachment } from '@/api/purchase'
 export default {
   name: 'UploadVoucherModal',
@@ -67,13 +69,13 @@ export default {
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
+      // 表单布局设置
       formItemLayout: {
         labelCol: { span: 4 },
         wrapperCol: { span: 20 }
       },
-      form:{},
-      attachList: null,
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'
+      attachList: null, // 上传附件列表
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'// 上传附件地址
     }
   },
   methods: {

+ 3 - 10
src/views/purchasingManagement/purchaseReceipt/viewLogisticsModal.vue

@@ -14,16 +14,8 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-con">
-        <a-button
-          v-if="itemNo"
-          id="viewLogistics-cancel"
-          class="button-cancel"
-          @click="handleCopy">复制</a-button>
-        <a-button
-          v-else
-          id="viewLogistics-cancel"
-          class="button-cancel"
-          @click="isShow=false">关闭</a-button>
+        <a-button v-if="itemNo" id="viewLogistics-cancel" class="button-cancel" @click="handleCopy">复制</a-button>
+        <a-button v-else id="viewLogistics-cancel" class="button-cancel" @click="isShow=false">关闭</a-button>
       </div>
     </div>
   </a-modal>
@@ -50,6 +42,7 @@ export default {
     }
   },
   methods: {
+    // 复制物流单号
     async handleCopy () {
       const _this = this
       try {