1

src/components/order-card-item/index.vue

@@ -416,8 +416,8 @@
             width = 1252;
             height = 1819;
           }else if(prodName.indexOf("明信片") !== -1){
-            width = 1229;
-            height = 1796;
+            width = 1252;
+            height = 1819;
           }else if(prodName.indexOf("三宫格") !== -1){
             width = 673;
             height = 1547;
@@ -481,6 +481,9 @@
           }else if(prodName.indexOf("大3寸") !== -1){
             width = 803;
             height = 1098;
+          }else if(prodName.indexOf("闪耀") !== -1){
+            width = 803;
+            height = 1098;
           }
           let _URL = window.URL || window.webkitURL;
           let img = new Image();
@@ -634,6 +637,8 @@
           this.prodType = '游戏';
         }else if(prodName.indexOf('大3寸') != -1){
           this.prodType = '大3寸';
+        }else if(prodName.indexOf('闪耀') != -1){
+          this.prodType = '闪耀';
         }
         this.$nextTick(() =>{
           this.$refs.canvasPreviewRef.init(cardItem, this.resourcesUrl + picUrl, this.prodType, side)

src/views/modules/order/order.vue

@@ -238,7 +238,7 @@
             >
           </el-form-item>
           <el-form-item>
-            <div class="default-btn" :class="{ 'is-active': timeActive === 1 }" @click="setDateRange(1)">{{
+            <!--<div class="default-btn" :class="{ 'is-active': timeActive === 1 }" @click="setDateRange(1)">{{
               $t("time.t")
             }}</div>
             <div class="default-btn" :class="{ 'is-active': timeActive === 2 }" @click="setDateRange(2)">{{
@@ -249,7 +249,7 @@
             }}</div>
             <div class="default-btn" :class="{ 'is-active': timeActive === 4 }" @click="setDateRange(4)">{{
               $t("temp.m")
-            }}</div>
+            }}</div>-->
             <div
               class="default-btn primary-btn"
               @click="searchChange(true)"
@@ -291,6 +291,14 @@
               size="small"
             ></el-input>
           </el-form-item>
+          <el-form-item label="排除商品"  :label-width=" lang === 'en' ? '145px' : '85px'">
+            <el-input
+              v-model="dataForm.notLikeProdName"
+              placeholder="请输入排除商品名称"
+              clearable
+              size="small"
+            ></el-input>
+          </el-form-item>
         </div>
       </el-form>
     </div>
@@ -1742,7 +1750,8 @@ export default {
           'skuName': this.dataForm.skuName, // 产品名称,
           'isPromotion': this.dataForm.isPromotion,
           'prodZone': this.dataForm.prodZone,
-          'remarks': this.dataForm.remarks
+          'remarks': this.dataForm.remarks,
+          'notLikeProdName': this.dataForm.notLikeProdName
         }
       } else {
         this.theData.current = page == null ? this.page.currentPage : page.currentPage

src/views/modules/pickCard/card-user-purchase-item-add-or-update.vue

@@ -34,6 +34,7 @@
     <div class="card-box" @scroll="backScrollEvent">
       <div class="create-card-lib" v-for="(cardItem, index) in cardLibItemList" :key="index">
         <div :style="(mode === 'choose' && cardItem.isSelected? divLightStyle : {border: '3px solid #fff'})" @click="mode==='choose'? cardItemSelect(cardItem) : (mode==='check'? cardItemCheck(cardItem): '')">
+          <span class="item-num" v-if="cardItem.no && searchForm.seriesId !== null && searchForm.personId != null">{{ cardItem.no }}</span>
           <el-row :gutter="12">
             <div style="padding: 1px; text-align: center">
               <span>{{cardItem.seriesName}}</span>
@@ -110,7 +111,7 @@ export default {
       page: {
         total: 0, // 总页数
         currentPage: 1, // 当前页数
-        pageSize: 50 // 每页显示多少条
+        pageSize: 500 // 每页显示多少条
       },
     }
   },
@@ -133,7 +134,7 @@ export default {
         this.$message.error("必须是大于0")
       }
       this.cardLibItemList.forEach(item=> item.cardCount = this.batchNum)
-      let cardItem = {userPurchaseId: this.dataForm.userPurchaseId, cardCount: this.batchNum}
+      let cardItem = {userPurchaseId: this.dataForm.userPurchaseId, cardCount: this.batchNum, seriesId: this.searchForm.seriesId, personId: this.searchForm.personId}
       this.$http({
         url: this.$http.adornUrl('/card/cardUserPurchaseItem/updateBatch'),
         method: 'post',
@@ -172,7 +173,7 @@ export default {
     },
     getUserPurchaseStat(){
       this.$http({
-        url: this.$http.adornUrl('/card/cardUserPurchase/stat/' + this.dataForm.userPurchaseId),
+        url: this.$http.adornUrl('/card/cardUserPurchase//stat'),
         method: 'get'
       }).then(({data}) => {
         this.stat = '统计情况：已选' + '团队组合数：' + data.seriesNum + '个， 成员人数：' + data.personNum + '个，图片款数：' + data.cardNum + '款，定制总张数：' + data.cardCount + '张'
@@ -211,6 +212,14 @@ export default {
           this.cardLibItemList.push(...data.records)
         }else{
           this.cardLibItemList = data.records
+          if(this.searchForm.seriesId && this.searchForm.personId){
+            let _this = this
+            this.cardLibItemList = data.records
+            this.cardLibItemList.forEach((item, index) => {
+              item.no = _this.cardLibItemList.length - index
+              _this.$set(_this.cardLibItemList, index, item)
+            })
+          }
         }
       })
     },
@@ -246,6 +255,13 @@ export default {
             this.$delete(this.cardLibItemList, index);
             this.$message.success("删除成功");
             this.getUserPurchaseStat()
+            if(this.searchForm.seriesId && this.searchForm.personId){
+              let _this = this
+              this.cardLibItemList.forEach((item, index) => {
+                item.no = _this.cardLibItemList.length - index
+                _this.$set(_this.cardLibItemList, index, item)
+              })
+            }
           }else{
             this.$message.error("删除失败");
           }
@@ -316,7 +332,23 @@ export default {
   .create-card-lib {
     border: 2px solid pink;
     display: inline-block;
-    margin-right: 15px
+    margin-right: 15px;
+  .item-num {
+    display: flex;
+    position: relative;
+    justify-content: center;
+    align-items: center;
+    float: left;
+    left:1px;
+    top:0px;
+    font-size: 16px;
+    text-align: center;
+    color: white;
+    background-color: red;
+    border-radius: 100%;
+    width: 30px;
+    height: 30px;
+  }
   }
   .card-box {
     margin-top: 10px;

src/views/modules/print/print-order.vue

@@ -188,7 +188,7 @@
         <!-- 列标题 -->
         <div :class="['tit', showHeadScroll ? 'fixed-top' : '']">
           <el-row style="width: 100%">
-            <el-col :span="5" id="prod-info-title">
+            <el-col :span="4" id="prod-info-title">
               <span class="item product">订单信息</span>
             </el-col>
             <el-col :span="4" class="column-title">
@@ -203,6 +203,9 @@
             <el-col :span="2" class="column-title">
               <span class="item">克数</span>
             </el-col>
+            <el-col :span="2" class="column-title">
+              <span class="item">类型</span>
+            </el-col>
             <el-col :span="2" class="column-title">
               <span class="item">买家/收货人</span>
             </el-col>
@@ -212,7 +215,7 @@
             <el-col :span="2" class="column-title">
               <span class="item">客服备注</span>
             </el-col>
-            <el-col :span="3" class="column-title">
+            <el-col :span="2" class="column-title">
               <span class="item">{{ $t("publics.operating") }}</span>
             </el-col>
           </el-row>
@@ -259,7 +262,7 @@
                   </div>
                 </div>
               </el-col>
-              <el-col :span="4" style="height: 100%">
+              <el-col :span="3" style="height: 100%">
                 <div class="item prod-item">
                   <span>{{order.prodName}}</span>
                   <!--<el-tooltip placement="top">
@@ -298,6 +301,17 @@
                   <span style="font-size: 24px; color: red">{{order.gram}}</span>
                 </div>
               </el-col>
+              <!-- 产品类型 -->
+              <el-col :span="2" style="height: 100%">
+                <div class="item">
+                  <span v-if="order.pdfLayoutType === '3CXK'" style="font-size: 24px; color: red">3寸</span>
+                  <span v-if="order.pdfLayoutType === 'D3CXK'" style="font-size: 24px; color: red">大3寸</span>
+                  <span v-if="order.pdfLayoutType === 'MXP'" style="font-size: 24px; color: red">明信片</span>
+                  <span v-if="order.pdfLayoutType === 'SQ'" style="font-size: 24px; color: red">书签</span>
+                  <span v-if="order.pdfLayoutType === 'ZP'" style="font-size: 24px; color: red">直拍</span>
+                  <span v-if="order.pdfLayoutType === '5CXK'" style="font-size: 24px; color: red">5寸</span>
+                </div>
+              </el-col>
               <!-- 买家信息 -->
               <el-col :span="2" style="height: 100%">
                 <div class="item">
@@ -365,7 +379,7 @@
                   <span v-else>暂无备注</span>
                 </div>
               </el-col>
-              <el-col :span="3" style="height: 100%">
+              <el-col :span="2" style="height: 100%">
                 <div class="item">
                   <div class="operate">
                     <div

src/views/modules/prod/printPicLib-add-or-update.vue

@@ -149,6 +149,21 @@ export default {
       }else if(prodName.indexOf("直拍") !== -1){
         width = 732;
         height = 1252;
+      }else if(prodName.indexOf("永夜星河") !== -1){
+        width = 803;
+        height = 1098;
+      }else if(prodName.indexOf("珠帘玉幕") !== -1){
+        width = 803;
+        height = 1098;
+      }else if(prodName.indexOf("双城之战") !== -1){
+        width = 803;
+        height = 1098;
+      }else if(prodName.indexOf("闪耀的恒星") !== -1){
+        width = 803;
+        height = 1098;
+      }else if(prodName.indexOf("九重紫") !== -1){
+        width = 803;
+        height = 1098;
       }
       return {width, height};
     },

src/views/modules/settlement/third-print-settlement.vue

@@ -115,7 +115,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="4" v-if="employeeType === 0 || employeeId === 43">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">额外扣减金额</span>
@@ -437,6 +437,7 @@
           }else{
             this.$message.error("删除失败");
           }
+          this.getDataList(this.page)
         }).catch((error) => {
         })
       },