Merge branch 'base-dev' of gitee.com:cabbage_qd/web-base-admin into bd-dev

2025-04-28 17:40:09 +08:00 · 2025-04-28 17:40:09 +08:00 · affc6ff9bf
parent 3c7acabb03 f208f8fdb2
commit affc6ff9bf
7 changed files with 152 additions and 144 deletions
--- a/src/views/framework/architecture/azjg2.vue
+++ b/src/views/framework/architecture/azjg2.vue
@ -129,8 +129,8 @@
              <div class="linecontent">复购累计</div>
              <div class="linecontent">首购结余</div>
              <div class="linecontent">复购结余</div>
-              <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div>
+              <!-- <div class="linecontent">新増套数</div>
+              <div class="linecontent">累计套数</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">左区</div>
@ -148,8 +148,8 @@
              <div class="linecontent">
                {{ treeData.leftRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">右区</div>
@ -169,8 +169,8 @@
              <div class="linecontent">
                {{ treeData.rightRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div> -->
            </div>
          </div>
        </div>
--- a/src/views/framework/architecture/azjg3.vue
+++ b/src/views/framework/architecture/azjg3.vue
@ -131,8 +131,8 @@
          <div class="linecontent">复购累计</div>
          <div class="linecontent">首购结余</div>
          <div class="linecontent">复购结余</div>
-          <div class="linecontent">新増套数</div>
-          <div class="linecontent">累计套数</div>
+          <!-- <div class="linecontent">新増套数</div>
+          <div class="linecontent">累计套数</div> -->
        </div>
        <div class="flexbox">
          <div class="thetitle">左区</div>
@ -144,8 +144,8 @@
          <div class="linecontent">{{ popdata.leftRepeatPurchaseTotal }}</div>
          <div class="linecontent">{{ popdata.leftFirstSurplus }}</div>
          <div class="linecontent">{{ popdata.leftRepeatPurchaseSurplus }}</div>
-          <div class="linecontent">{{ popdata.aNewBox || 0 }}</div>
-          <div class="linecontent">{{ popdata.aSumBox || 0 }}</div>
+          <!-- <div class="linecontent">{{ popdata.aNewBox || 0 }}</div>
+          <div class="linecontent">{{ popdata.aSumBox || 0 }}</div> -->
        </div>
        <div class="flexbox">
          <div class="thetitle">右区</div>
@ -159,8 +159,8 @@
          <div class="linecontent">
            {{ popdata.rightRepeatPurchaseSurplus }}
          </div>
-          <div class="linecontent">{{ popdata.bNewBox || 0 }}</div>
-          <div class="linecontent">{{ popdata.bSumBox || 0 }}</div>
+          <!-- <div class="linecontent">{{ popdata.bNewBox || 0 }}</div>
+          <div class="linecontent">{{ popdata.bSumBox || 0 }}</div> -->
        </div>
      </div>
    </div>
--- a/src/views/framework/architecture/azjg4.vue
+++ b/src/views/framework/architecture/azjg4.vue
@ -121,8 +121,8 @@
              <div class="linecontent">复购累计</div>
              <div class="linecontent">首购结余</div>
              <div class="linecontent">复购结余</div>
-              <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div>
+              <!-- <div class="linecontent">新増套数</div>
+              <div class="linecontent">累计套数</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">左区</div>
@ -136,8 +136,8 @@
              <div class="linecontent">
                {{ data.leftRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ data.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ data.aSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ data.aNewBox || 0 }}</div>
+              <div class="linecontent">{{ data.aSumBox || 0 }}</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">右区</div>
@ -151,8 +151,8 @@
              <div class="linecontent">
                {{ data.rightRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ data.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ data.bSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ data.bNewBox || 0 }}</div>
+              <div class="linecontent">{{ data.bSumBox || 0 }}</div> -->
            </div>
          </div>
        </div>
--- a/src/views/framework/architecture/azjg5.vue
+++ b/src/views/framework/architecture/azjg5.vue
@ -119,8 +119,8 @@
              <div class="linecontent">复购累计</div>
              <div class="linecontent">首购结余</div>
              <div class="linecontent">复购结余</div>
-              <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div>
+              <!-- <div class="linecontent">新増套数</div>
+              <div class="linecontent">累计套数</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">左区</div>
@ -138,8 +138,8 @@
              <div class="linecontent">
                {{ treeData.leftRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">右区</div>
@ -159,8 +159,8 @@
              <div class="linecontent">
                {{ treeData.rightRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div> -->
            </div>
          </div>
        </div>
--- a/src/views/framework/architecture/index.vue
+++ b/src/views/framework/architecture/index.vue
@ -135,8 +135,8 @@
              <div class="linecontent">复购累计</div>
              <div class="linecontent">首购结余</div>
              <div class="linecontent">复购结余</div>
-              <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div>
+              <!-- <div class="linecontent">新増套数</div>
+              <div class="linecontent">累计套数</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">左区</div>
@ -154,8 +154,8 @@
              <div class="linecontent">
                {{ treeData.leftRepeatPurchaseSurplus || 0 }}
              </div>
-              <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div> -->
            </div>
            <div class="flexbox">
              <div class="thetitle">右区</div>
@ -175,8 +175,8 @@
              <div class="linecontent">
                {{ treeData.rightRepeatPurchaseSurplus }}
              </div>
-              <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div>
+              <!-- <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
+              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div> -->
            </div>
          </div>
        </div>
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@ -710,26 +710,19 @@
            label="服务协议"
            width="180"
          />
-
          <el-table-column
-            v-if="menuList[16].checked == true && allTxt.superStudioVal"
+            key="purchaseStatus"
            align="center"
-            prop="superStudioVal"
-            :label="'超级工作室'"
+            prop="purchaseStatus"
+            label="复购免考"
            width="180"
          >
            <template slot-scope="scope">
-              <span
-                v-if="scope.row.superStudio == 0"
-                style="color: #009b58"
-              >已认证</span>
-              <span
-                v-if="scope.row.superStudio == 1"
-                style="color: #c8161d"
-              >未认证</span>
+              <span>
+                {{ scope.row.purchaseStatus === 0 ? '是' : '否' }}
+              </span>
            </template>
          </el-table-column>
-
          <el-table-column
            v-if="menuList[17].checked == true && allTxt.accountStatusVal"
            align="center"
--- a/src/views/marketing/rechargeCard/addRechargeCard.vue
+++ b/src/views/marketing/rechargeCard/addRechargeCard.vue
@ -129,21 +129,21 @@
              </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" />
            </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"
                type="date"
                value-format="yyyy-MM-dd"
                format="yyyy-MM-dd"
@ -233,16 +233,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 +268,11 @@
              prop="productName"
              :label="'产品名称'"
            />
-            <el-table-column align="center"
+            <el-table-column
+              align="center"
              prop="productCode"
-                           :label="'产品编号'">
-          </el-table-column>
+              :label="'产品编号'"
+            />
            <el-table-column
              align="center"
              prop="productName"
@ -424,7 +429,7 @@ export default {
      plcz: {},
      select: {}, // 产品筛选
      dialogList: [], // 产品数组
-      selectData: [], // 选中
+      selectData: undefined, // 选中
      skuList: [], // 规格数组
      selSkuList: '',
      selSkuNameList: '',
@ -519,7 +524,6 @@ export default {
              }
            ] }], 'orderType': 1 }]
        }
-
      })
      this.$forceUpdate()
    },
@ -558,7 +562,7 @@ 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 : ''
          }
        )
      })
@ -627,7 +631,7 @@ export default {
          path: 'rechargeQc',
          query: {
            data: JSON.stringify(dataList),
-            approvalBusiness: 700,
+            approvalBusiness: 700
          }
        })
      }
@ -641,7 +645,7 @@ 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 : ''
          }
        )
      })
@ -690,13 +694,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 +768,7 @@ export default {
      this.isArea = val
    },
    handleClose() {
-      this.selectData = []
+      this.selectData = undefined
      this.dialogVisible = false
    },
    handleCloseGg() {
@ -872,18 +882,23 @@ export default {
    },
    selected(selection, row) {
      // 清除 所有勾选项
-      this.$refs.multipleTable.clearSelection()
-      // 当表格数据都没有被勾选的时候 就返回
-      // 主要用于将当前勾选的表格状态清除
-      if (selection.length == 0) return
-      this.$refs.multipleTable.toggleRowSelection(row, true)
+      if (selection.length === 0) {
+        this.selectData = undefined
+      } else {
        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'