feat(rechargeCard): 充值提货卡去签呈

src/views/goodsManage/goodsList/goodsEdit/jcsz.vue

@@ -333,7 +333,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
+              <el-col :span="8">
                 <el-form-item label="上传盒数" prop="boxNum">
                   <el-input
                     v-model="form.boxNum"
@@ -341,7 +341,7 @@
                     :placeholder="'请输入'"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
                   <el-checkbox-group

src/views/goodsManage/goodsRelease/jcsz.vue

@@ -295,7 +295,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
+              <el-col :span="8">
                 <el-form-item label="上传盒数" prop="boxNum">
                   <el-input
                     v-model="form.boxNum"
@@ -303,7 +303,7 @@
                     :placeholder="'请输入'"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
                   <el-checkbox-group v-model="form.pkGuaranteeLabel">

src/views/marketing/rechargeCard/addRechargeCard.vue

@@ -30,8 +30,9 @@
               <el-button
                 type="primary"
                 size="mini"
+                :disabled="addBtnDisabled"
                 @click="addNewGoods"
-              >{{'添加'}}
+              >添加
               </el-button>
             </th>
             <th
@@ -62,16 +63,16 @@
           class="table_b"
         >
           <tr style="border-top:0">
-            <td colspan="2">{{ '会员编号' }}</td>
+            <td colspan="2">会员编号</td>
-            <td colspan="2">{{ '会员名称' }}</td>
+            <td colspan="2">会员名称</td>
-            <td colspan="4">{{'产品名称'}}</td>
+            <td colspan="4">产品名称</td>
-            <td colspan="4">{{'产品规格'}}</td>
+            <td colspan="4">产品规格</td>
-            <td colspan="2">{{'提货基数'}}</td>
+            <td colspan="2">提货基数</td>
             <td colspan="2">可提数量</td>
             <td colspan="2">增加数量</td>
-            <td colspan="2">{{ '截止日期' }}</td>
+            <td colspan="2">截止日期</td>
-            <td colspan="2">{{ '包邮类型' }}</td>
+            <td colspan="2">包邮类型</td>
-
+            <td colspan="2">提货来源</td>
           </tr>
           <tr
             v-for="ctem,cndex in item.consumeRuleConfigList"
@@ -128,33 +129,39 @@
                 >
               </div>
             </td>
+            <!-- 提货基数 -->
             <td colspan="2" style="border-right: 1px solid #fff">
-              <el-input :disabled="deled" v-model="ctem.baseQuantity" />
+              <el-input
+                v-model="ctem.baseQuantity"
+                :disabled="deled || ctem.pickType == 8"
+              />
             </td>
             <!-- 可提数量 -->
             <td colspan="2" style="border-right: 1px solid #fff">
-              <el-input disabled v-model="ctem.usableQuantity" />
+              <el-input v-model="ctem.usableQuantity" disabled />
             </td>
             <!-- 增加数量 -->
             <td colspan="2" style="border-right: 1px solid #fff">
-              <el-input :disabled="deled" v-model="ctem.quantity" />
+              <el-input v-model="ctem.quantity" :disabled="deled" />
             </td>
+            <!-- 截止日期 -->
             <td colspan="2" style="border-right: 1px solid #fff">
               <!--              <el-input v-model="ctem.orderAchieve"></el-input>-->
               <el-date-picker
-              :disabled="deled"
                 v-model="ctem.receiveTime"
+                :disabled="deled || (ctem.pickType == 8 && !addFlag)"
                 type="date"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
                 :placeholder="'请选择时间'"
               />
             </td>
+            <!-- 包邮类型 -->
             <td colspan="2">
               <el-select
                 v-model="ctem.isFreeMail"
                 clearable
-                :disabled="deled"
+                :disabled="deled || (ctem.pickType == 8 && !addFlag)"
               >
                 <el-option
                   v-for="item in postList"
@@ -212,6 +219,15 @@
                 </el-checkbox-group>
               </div>
             </td>
+            <td colspan="2">
+              <el-select
+                v-model="ctem.pickType"
+                :disabled="disableds"
+                @change="(val) => pickTypeChange(val, ctem)"
+              >
+                <el-option v-for="item in pickTypeList" :key="item.val" :label="item.text" :value="item.val" />
+              </el-select>
+            </td>
           </tr>
         </table>
       </div>
@@ -233,16 +249,20 @@
       >
         <div class="cpHeight">
           <el-row>
-       <el-col :span="22"> <el-input v-model="select.queryInfo"
+            <el-col :span="22"> <el-input
+              v-model="select.queryInfo"
               clearable
               :placeholder="'请输入'"
+              prefix-icon="el-icon-search"
               @keyup.enter.native="getDataList"
-                  prefix-icon="el-icon-search"></el-input>
+            />
             </el-col>
             <el-col :span="2">
-                  <el-button type="primary"
+              <el-button
+                type="primary"
                 size="small"
-                         @click="getDataList"> {{ '搜索' }}</el-button>
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
             </el-col>
           </el-row>
           <div style="height:10px" />
@@ -264,10 +284,11 @@
               prop="productName"
               :label="'产品名称'"
             />
-            <el-table-column align="center"
+            <el-table-column
+              align="center"
               prop="productCode"
-                           :label="'产品编号'">
+              :label="'产品编号'"
-          </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="productName"
@@ -389,14 +410,11 @@ import * as api from '@/api/giftGoods.js'
 import * as apis from '@/api/product.js'
 import * as api_s from '@/api/financial.js'
 import topBar from '@/components/topBar'
-import ImageUpload from '@/components/ImageUpload'
-import { getMemberName } from '@/api/financial'
-import { getQueryString } from '@/utils'
 import { pickDetail } from '@/api/manage'
+import * as man from '@/api/manage'
 export default {
   components: {
-    topBar,
+    topBar
-    ImageUpload
   },
   data() {
     return {
@@ -424,7 +442,7 @@ export default {
       plcz: {},
       select: {}, // 产品筛选
       dialogList: [], // 产品数组
-      selectData: [], // 选中
+      selectData: undefined, // 选中
       skuList: [], // 规格数组
       selSkuList: '',
       selSkuNameList: '',
@@ -449,9 +467,24 @@ export default {
           text: '不包邮',
           val: 1
         }
+      ],
+      pickTypeList: [
+        {
+          text: '提货产品',
+          val: 0
+        },
+        {
+          text: '法宝券',
+          val: 8
+        }
       ]
     }
   },
+  computed: {
+    addBtnDisabled() {
+      return this.allData.some(item => item.consumeRuleConfigList.length > 0)
+    }
+  },
   mounted() {
     const geturl = window.location.href
     const getqyinfo = geturl.split('?')[1]
@@ -490,6 +523,7 @@ export default {
             usableQuantity: res.data.usableQuantity,
             quantity: 0,
             isFreeMail: res.data.isFreeMail,
+            pickType: res.data.pickType,
             waresGiftConfigList: [
               {
                 pkProduct: res.data.detailList[0].pkProduct,
@@ -509,6 +543,7 @@ export default {
             usableQuantity: res.data.usableQuantity,
             quantity: 0,
             isFreeMail: res.data.isFreeMail,
+            pickType: res.data.pickType,
             waresGiftConfigList: [
               {
                 pkProduct: '',
@@ -519,7 +554,6 @@ export default {
               }
             ] }], 'orderType': 1 }]
         }
-
       })
       this.$forceUpdate()
     },
@@ -551,14 +585,21 @@ export default {
     },
     saveDate() {
       const dataList = []
-      this.allData[0].consumeRuleConfigList.forEach((res) => {
+      this.allData[0].consumeRuleConfigList.forEach((item) => {
         dataList.push(
-          { 'memberCode': res.memberCode, 'pkProduct': res.waresGiftConfigList[0].pkProduct, 'memberName': res.memberName,
+          { 'memberCode': item.memberCode,
-            'productName': res.waresGiftConfigList[0].productName + res.waresGiftConfigList[0].specsName,
+            'pkProduct': item.waresGiftConfigList[0].pkProduct,
-            'receiveTime': res.receiveTime,
+            'memberName': item.memberName,
-            'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
+            'productName': item.waresGiftConfigList[0].productName + item.waresGiftConfigList[0].specsName,
-            'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
+            'receiveTime': item.receiveTime,
-            "pkId":res.pkId?res.pkId:''
+            'specsName': item.waresGiftConfigList[0].specsName,
+            'specsNameId': item.waresGiftConfigList[0].specsNameId,
+            'baseQuantity': item.baseQuantity,
+            'quantity': item.quantity,
+            'isFreeMail': item.isFreeMail,
+            'pkPostage': item.pkPostage,
+            'pkId': item.pkId ? item.pkId : '',
+            'pickType': item.pickType
           }
         )
       })
@@ -623,11 +664,21 @@ export default {
           type: 'warning'
         })
       } else {
-        this.$router.push({
+        const params = {
-          path: 'rechargeQc',
+          detailList: dataList,
-          query: {
+          signType: 0, // 普通件，急件，密件
-            data: JSON.stringify(dataList),
+          remark: '', // 备注
-            approvalBusiness: 700,
+          fileList: [], // 附件[]
+          userIdList: [], // 审批流程[]
+          sendIdList: [] // 审批流程[]
+        }
+        man.rechargeConfirm(params).then((res) => {
+          if (res.code === 200) {
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+            this.$router.go(-1)
           }
         })
       }
@@ -641,18 +692,30 @@ export default {
             'receiveTime': res.receiveTime,
             'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
             'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
-            "pkId":res.pkId?res.pkId:''
+            'pkId': res.pkId ? res.pkId : ''
           }
         )
       })
-      this.$router.push({
+      const params = {
-          path: 'rechargeQc',
+        detailList: dataList
-          query: {
+      }
-            data: JSON.stringify(dataList),
+      man.rechargeDel(params).then((res) => {
-            approvalBusiness: 701,
+        if (res.code === 200) {
-            type:this.deled
+          this.$message({
+            message: res.msg,
+            type: 'success'
+          })
+          this.$router.go(-1)
         }
       })
+      // this.$router.push({
+      //   path: 'rechargeQc',
+      //   query: {
+      //     data: JSON.stringify(dataList),
+      //     approvalBusiness: 701,
+      //     type: this.deled
+      //   }
+      // })
     },
     getPage(allData) {
       this.allData = allData
@@ -690,13 +753,19 @@ export default {
       this.ggVisible = false
     },
     sureProduct() {
-      if (this.selectData.length == 0) {
+      if (!this.selectData) {
         this.$message({
           message: '请选择产品',
           type: 'warning'
         })
-        return false
       } else {
+        if (!this.selectData.selSkuNameList || this.selectData.selSkuNameList.length === 0) {
+          this.$message({
+            message: '请选择产品规格',
+            type: 'warning'
+          })
+          return
+        }
         this.allData.forEach((item) => {
           if (this.isArea == item.orderType) {
             item.consumeRuleConfigList[this.showCndex].waresGiftConfigList[
@@ -758,7 +827,7 @@ export default {
       this.isArea = val
     },
     handleClose() {
-      this.selectData = []
+      this.selectData = undefined
       this.dialogVisible = false
     },
     handleCloseGg() {
@@ -803,8 +872,10 @@ export default {
                 specsName: '',
                 specsNameId: '',
                 quantity: ''
+
               }
-            ]
+            ],
+            pickType: 0
           })
         }
       })
@@ -872,18 +943,23 @@ export default {
     },
     selected(selection, row) {
       // 清除 所有勾选项
-      this.$refs.multipleTable.clearSelection()
+      if (selection.length === 0) {
-      // 当表格数据都没有被勾选的时候 就返回
+        this.selectData = undefined
-      // 主要用于将当前勾选的表格状态清除
+      } else {
-      if (selection.length == 0) return
-      this.$refs.multipleTable.toggleRowSelection(row, true)
         this.selectData = row
+      }
+
+      this.$refs.multipleTable.clearSelection()
+      this.$refs.multipleTable.toggleRowSelection(row, true)
+      // // 当表格数据都没有被勾选的时候 就返回
+      // // 主要用于将当前勾选的表格状态清除
+      // this.$nextTick(() => {
+      //   if (selection.length == 0) return
+      //   this.$refs.multipleTable.toggleRowSelection(row, true)
+      //   this.selectData = row
+      // })
     },
-    // 表格的选中 可以获得当前选中的数据
+
-    selectionChange(val) {
-      // 将选中的数据存储起来
-      this.selectData = val
-    },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
         return 'warning-row'
@@ -891,6 +967,11 @@ export default {
         return 'success-row'
       }
       return ''
+    },
+    pickTypeChange(val, item) {
+      if (val === 8) {
+        this.$set(item, 'baseQuantity', '1')
+      }
     }
   }
 }

src/views/marketing/rechargeCard/index.vue

@@ -111,22 +111,22 @@
       <div class="main_a">
         <div class="mainbtn">
           <el-button
+            v-hasButtons="['cardAdd']"
             size="small"
             class="addBtn"
-            v-hasButtons="['cardAdd']"
             @click="openDig"
           >{{ '添加' }}</el-button>
           <el-button
+            v-hasButtons="['cardExport']"
             size="small"
             class="thebtn2"
-            v-hasButtons="['cardExport']"
             @click="handleExport"
-          > {{ '导出' }}</el-button>
+          > 导出</el-button>
         </div>
         <div class="maintable">
           <el-table
-            :data="tableData"
             v-loading="loading"
+            :data="tableData"
             style="width: 100%"
             height="73vh"
             :header-cell-style="{ background: '#EEEEEE' }"
@@ -152,6 +152,7 @@
               align="center"
               prop=""
               :label="'产品名称(规格)'"
+              min-width="230"
             >
               <template slot-scope="scope">
                 <div v-for="item in scope.row.detailList">
@@ -222,19 +223,23 @@
               <template slot-scope="scope">
 
                 <div class="btnHeng">
-                <div @click="toFixed(scope.row.pkId,2)"
+                  <div
-                     type="text"
+
-                     v-if="scope.row.pickType!=8"
                     v-hasButtons="['cardUpdata']"
+                    type="text"
                     style="color:#F3A900"
-                     size="small">
+                    size="small"
+                    @click="toFixed(scope.row.pkId,2)"
+                  >
                     {{ '修改' }}
                   </div>
-                <div @click="toDel(scope.row.pkId)"
+                  <div
-                     type="text"
                     v-hasButtons="['cardDel']"
+                    type="text"
                     size="small"
-                     style="color: #C8161D">
+                    style="color: #C8161D"
+                    @click="toDel(scope.row.pkId)"
+                  >
                     {{ '删除' }}
                   </div>
                 </div>
@@ -257,8 +262,8 @@
 <script>
 import topBar from '@/components/topBar'
 import * as api from '@/api/giftGoods.js'
-import {tgtype} from "@/api/giftGoods.js";
+import { tgtype } from '@/api/giftGoods.js'
-import {getPickList} from "@/api/manage";
+import { getPickList } from '@/api/manage'
 export default {
   name: 'Bzpz',
   components: {
@@ -267,9 +272,9 @@ export default {
   filters: {
     isAgree(val) {
       if (!val) {
-        return '允许';
+        return '允许'
       } else {
-        return '禁止';
+        return '禁止'
       }
     }
   },