Selaa lähdekoodia

Merge branch 'develop_yh56' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh56

lilei 2 kuukautta sitten
vanhempi
commit
0f822ef9d9

+ 19 - 19
src/config/router.config.js

@@ -474,7 +474,7 @@ export const asyncRouterMap = [
             meta: {
               title: '货架设置',
               icon: 'monitor',
-              permission: 'M_shelfSet'
+              permission: 'M_shelfSetList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -485,8 +485,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '货架设置列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_salesQueryList'
+                  hidden: true,
+                  permission: 'M_shelfSetList'
                 }
               },
               {
@@ -591,8 +591,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '货架订单列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_shelfOrderList'
+                  hidden: true,
+                  permission: 'M_shelfOrderList'
                 }
               },
               {
@@ -602,8 +602,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '货架订单详情',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_shelfOrderDetail'
+                  hidden: true,
+                  permission: 'M_shelfOrderDetail'
                 }
               }
             ]
@@ -627,8 +627,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '补货管理列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_salesQueryList'
+                  hidden: true,
+                  permission: 'M_salesQueryList'
                 }
               }
             ]
@@ -652,8 +652,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '调回管理列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_salesQueryList'
+                  hidden: true,
+                  permission: 'M_salesQueryList'
                 }
               }
             ]
@@ -677,8 +677,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '结算管理列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_salesQueryList'
+                  hidden: true,
+                  permission: 'M_salesQueryList'
                 }
               },
               {
@@ -689,8 +689,8 @@ export const asyncRouterMap = [
                   title: '待结算明细',
                   icon: 'monitor',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'M_salesQueryList'
+                  replaceTab: true,
+                  permission: 'M_salesQueryList'
                 }
               },
               {
@@ -701,8 +701,8 @@ export const asyncRouterMap = [
                   title: '结算历史',
                   icon: 'monitor',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'M_salesQueryList'
+                  replaceTab: true,
+                  permission: 'M_salesQueryList'
                 }
               }
             ]
@@ -999,7 +999,7 @@ export const asyncRouterMap = [
             meta: {
               title: '商城产品',
               icon: 'monitor',
-              permission: 'M_easyPassShopping'
+              permission: 'M_easyPassShoppingList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1060,7 +1060,7 @@ export const asyncRouterMap = [
             meta: {
               title: '促销产品',
               icon: 'contacts',
-              permission: 'M_promotionalProduct'
+              permission: 'M_promotionalProductList'
             },
             hideChildrenInMenu: true,
             children: [

+ 42 - 36
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -308,8 +308,16 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+// 组件
 import { STable, VSelect } from '@/components'
 import { getOperationalPrecision } from '@/libs/tools.js'
+import ProductType from '../../common/productType.js'
+import ProductBrand from '../../common/productBrand.js'
+import Print from '@/views/common/print.vue'
+import importGuideModal from './importGuideModal.vue'
+import newProduct from '@/views/productManagement/productInfo/edit.vue'
+import { hdPrint } from '@/libs/JGPrint'
+// 接口
 import {
   sparePartsPurDetail,
   sparePartsPurDetailList,
@@ -320,14 +328,8 @@ import {
   sparePartsPurDetailPrint,
   sparePartsPurDeleteAll,
   sparePartsPurDetailInsertBatch } from '@/api/sparePartsPur'
-import { bulkProductList } from '@/api/dealerProduct'
+import { bulkProductList, dealerProductList } from '@/api/dealerProduct'
 import { warehouseCascadeList } from '@/api/warehouse'
-import ProductType from '../../common/productType.js'
-import ProductBrand from '../../common/productBrand.js'
-import Print from '@/views/common/print.vue'
-import importGuideModal from './importGuideModal.vue'
-import newProduct from '@/views/productManagement/productInfo/edit.vue'
-import { hdPrint } from '@/libs/JGPrint'
 export default {
   name: 'BulkWarehousingEdit',
   components: { STable, VSelect, Print, ProductType, ProductBrand, newProduct, importGuideModal },
@@ -464,29 +466,33 @@ export default {
   },
   methods: {
     // 是否新增产品
-    isAddNewProduct (data) {
+    async isAddNewProduct (data) {
       const _this = this
       if (data.length == 0) {
-        _this.$confirm({
-          title: '提示',
-          content: '该产品信息不存在,是否马上新增?',
-          centered: true,
-          onOk () {
-            _this.paramsData = {
-              supplierName: _this.basicInfoData.supplierName,
-              code: _this.queryParam.code,
-              name: _this.queryParam.name,
-              origCode: _this.queryParam.origCode,
-              putCost: 0,
-              putQty: 1,
-              warehouse: []
+        const res = await dealerProductList({ code: _this.queryParam.code, enabledFlag: 0, pageNo: 1, pageSize: 50 })
+        const disableList = res.data.list
+        if (disableList && disableList.length == 0) {
+          _this.$confirm({
+            title: '提示',
+            content: '该产品信息不存在,是否马上新增?',
+            centered: true,
+            onOk () {
+              _this.paramsData = {
+                supplierName: _this.basicInfoData.supplierName,
+                code: _this.queryParam.code,
+                name: _this.queryParam.name,
+                origCode: _this.queryParam.origCode,
+                putCost: 0,
+                putQty: 1,
+                warehouse: []
+              }
+              _this.showNewProduct = true
+              _this.$nextTick(() => {
+                _this.$refs.newProduct.pageInit()
+              })
             }
-            _this.showNewProduct = true
-            _this.$nextTick(() => {
-              _this.$refs.newProduct.pageInit()
-            })
-          }
-        })
+          })
+        }
       } else {
         // 新添加的产品自动添加到已选产品中
         if (data.length == 1 && this.showNewProduct) {
@@ -551,24 +557,24 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit) {
       const _this = this
-      if (!isEdit && (row.enabledFlag || row.enabledFlag == 0)) {
-        this.$message.warning('产品已禁用,不能添加!')
-        return
-      }
       if (!isEdit && !(row.putCost || row.putCost == 0)) {
-        this.$message.warning('请输入成本价后再添加!')
+        _this.$message.warning('请输入成本价后再添加!')
         return
       }
       if (!isEdit && !row.putQty) {
-        this.$message.warning('请输入数量后再添加!')
+        _this.$message.warning('请输入数量后再添加!')
         return
       }
       if (!isEdit && !row.warehouseSn) {
-        this.$message.warning('请选择仓库后再添加!')
+        _this.$message.warning('请选择仓库后再添加!')
         return
       }
       if (!isEdit && !row.warehouseLocationSn) {
-        this.$message.warning('请选择仓位后再添加!')
+        _this.$message.warning('请选择仓位后再添加!')
+        return
+      }
+      if (!isEdit && row.enabledFlag == 0) {
+        _this.$message.warning('产品已禁用,不能添加!')
         return
       }
       // if (!isEdit && row.enabledFlag == '0') {
@@ -582,7 +588,7 @@ export default {
       //   })
       //   return
       // }
-      this.saveFormData(row, isEdit)
+      _this.saveFormData(row, isEdit)
     },
     // 保存
     saveFormData (row, isEdit) {

+ 22 - 24
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -15,7 +15,7 @@
                 <custList ref="custList" id="shelfSetList-custList" @change="custChange" :isEnabled="true"></custList>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <!--  <a-col :md="6" :sm="24">
               <a-form-item label="是否设置完成">
                 <v-select
                   v-model="queryParam.finishFlag"
@@ -25,7 +25,7 @@
                   placeholder="请选择"
                   allowClear></v-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :md="6" :sm="24" style="margin-bottom: 10px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfSetList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shelfSetList-reset">重置</a-button>
@@ -64,7 +64,7 @@
           </p>
         </template>
         <!-- 是否设置完成 -->
-        <template slot="finishFlag" slot-scope="text, record">
+        <!--  <template slot="finishFlag" slot-scope="text, record">
           <a-switch
             checkedChildren="是"
             unCheckedChildren="否"
@@ -77,7 +77,7 @@
           <span v-else :style="{ color: record.finishFlag == 1 ? '#00aa00' : '#999' }">
             {{ record.finishFlag == 1 ? '是' : (record.finishFlag!=undefined?'否':'--') }}
           </span>
-        </template>
+        </template> -->
         <!-- 启用禁用 -->
         <template slot="enableFlag" slot-scope="text, record">
           <a-switch
@@ -157,7 +157,6 @@ export default {
       queryParam: {
         shelfSn: undefined, // 货架sn
         customerSn: undefined, // 关联客户sn
-        finishFlag: undefined, // 是否完成设置
         customerEntity: { // 关联客户名称
           customerName: undefined
         }
@@ -168,7 +167,7 @@ export default {
         { title: '货架名称', scopedSlots: { customRender: 'shelfName' }, width: '25%', align: 'left', ellipsis: true },
         { title: '关联客户', dataIndex: 'customerEntity.customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '货位数量', scopedSlots: { customRender: 'shelfPlaceNum' }, width: '15%', align: 'center' },
-        { title: '是否设置完成', scopedSlots: { customRender: 'finishFlag' }, width: '10%', align: 'center' },
+        // { title: '是否设置完成', scopedSlots: { customRender: 'finishFlag' }, width: '10%', align: 'center' },
         { title: '启用状态', scopedSlots: { customRender: 'enableFlag' }, width: '10%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -223,23 +222,23 @@ export default {
         this.queryParam.customerSn = undefined
       }
     },
-    // 是否设置完成更改
-    changeStatus (record) {
-      const params = {
-        shelfSn: record.shelfSn,
-        finishFlag: record.finishFlag == 1 ? '0' : '1'
-      }
-      this.spinning = true
-      modifFinishFlag(params).then(res => {
-        if (res.status == 200) {
-          this.$message.success(res.message)
-          this.$refs.table.refresh()
-          this.spinning = false
-        } else {
-          this.spinning = false
-        }
-      })
-    },
+    // // 是否设置完成更改
+    // changeStatus (record) {
+    //   const params = {
+    //     shelfSn: record.shelfSn,
+    //     finishFlag: record.finishFlag == 1 ? '0' : '1'
+    //   }
+    //   this.spinning = true
+    //   modifFinishFlag(params).then(res => {
+    //     if (res.status == 200) {
+    //       this.$message.success(res.message)
+    //       this.$refs.table.refresh()
+    //       this.spinning = false
+    //     } else {
+    //       this.spinning = false
+    //     }
+    //   })
+    // },
     // 启用禁用
     enableShelf (record) {
       const params = {
@@ -290,7 +289,6 @@ export default {
       this.queryParam.customerSn = undefined
       this.queryParam.customerEntity.customerName = undefined
       this.$refs.custList.resetForm()
-      this.queryParam.finishFlag = undefined
       this.$refs.table.refresh(true)
     },
     // 计算表格高度

+ 1 - 1
src/views/salesManagement/onlinePayOrder/detail.vue

@@ -81,7 +81,7 @@
                 总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;
                 总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;
               </template>
-              <span>实收总售价:<strong>{{ detailData&&(detailData.totalRealAmount || detailData.totalRealAmount==0) ? toThousands(detailData.totalRealAmount) : '--' }}</strong>;</span>
+              <span>实收总售价:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>;</span>
               <span v-if="detailData&&detailData.sourceType&&detailData.sourceType==='XPRH_PURCHASE'"> 返券金额:<strong>{{ detailData&&(detailData.totalGiveAmount || detailData.totalGiveAmount==0) ? toThousands(detailData.totalGiveAmount) : '--' }}</strong>;</span>
               <span>抵扣金额:<strong>{{ detailData&&(detailData.subsidyAmount || detailData.subsidyAmount==0) ? toThousands(detailData.subsidyAmount) : '--' }}</strong>;</span>
             </div>