新增图集

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

@@ -373,12 +373,12 @@
           }else if(prodName.indexOf("70x210") !== -1){
             width = 898;
             height = 2551;
-          }else if(prodName.indexOf("游戏") !== -1 || prodName.indexOf("永夜星河") !== -1){
+          }else if(prodName.indexOf("游戏") !== -1 || prodName.indexOf("永夜星河") !== -1 || prodName.indexOf("珠帘玉幕") !== -1 || prodName.indexOf("双城之战") !== -1){
             width = 803;
             height = 1098;
           }else if(prodName.indexOf("大3寸") !== -1){
-            width = 732;
-            height = 1028;
+            width = 803;
+            height = 1098;
           }else if(prodName.indexOf("透明胶片拍立得") !== -1){
             width = 768;
             height = 768;
@@ -539,6 +539,10 @@
           this.prodType = '游戏';
         }else if(prodName.indexOf('永夜星河') != -1){
           this.prodType = '永夜星河';
+        }else if(prodName.indexOf('珠帘玉幕') != -1){
+          this.prodType = '珠帘玉幕';
+        }else if(prodName.indexOf('双城之战') != -1){
+          this.prodType = '双城之战';
         }else if(prodName.indexOf('大3寸') != -1){
           this.prodType = '大3寸';
         }else if(prodName.indexOf('透明胶片拍立得') != -1){

src/views/modules/order/order.vue

@@ -140,6 +140,14 @@
                             :default-time="['00:00:00', '23:59:59']"
               :end-placeholder="this.$i18n.t('date.end')"></el-date-picker>
           </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>
           <el-form-item>
             <div class="default-btn" @click="setDateRange(1)">{{
               $t("date.t")
@@ -1174,7 +1182,8 @@ export default {
           'customType': this.dataForm.customType,
           'shopId':this.dataForm.shopId,
           'isMerge': this.dataForm.isMerge,
-          'printStatus': this.dataForm.printStatus
+          'printStatus': this.dataForm.printStatus,
+          '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

@@ -176,8 +176,8 @@ export default {
       })
     },
     generateItemPdf(){
-      if(!this.searchForm.seriesId || !this.searchForm.personId){
-        this.$message.error('团队组合以及成员必选')
+      if(!this.searchForm.seriesId){
+        this.$message.error('团队组合必选')
         return
       }else{
         this.generatePdfLoading = true
@@ -189,6 +189,7 @@ export default {
           this.generatePdfLoading = false
           if(this.searchForm.personId){
             this.getPersonPdf()
+            this.generatePdfLoading = false
           }
           this.$message({
             message: '生成开始，请等待',
@@ -332,12 +333,12 @@ export default {
         method: 'get',
         params: this.$http.adornParams(
           Object.assign({
-              size: this.page.pageSize,
-              current: this.page.currentPage,
-              shopId: 1,
-              userPurchaseId: this.dataForm.userPurchaseId,
-              personId: this.searchForm.personId ===0? null: this.searchForm.personId,
-              seriesId: this.searchForm.seriesId === 0? null: this.searchForm.seriesId
+              size : this.searchForm.personId ? this.page.pageSize : 50,
+              current : this.page.currentPage,
+              shopId : 1,
+              userPurchaseId : this.dataForm.userPurchaseId,
+              personId : this.searchForm.personId === 0 ? null : this.searchForm.personId,
+              seriesId : this.searchForm.seriesId === 0 ? null : this.searchForm.seriesId
             }
           )
         )
@@ -458,6 +459,7 @@ export default {
       this.personList = []
       this.searchForm = {}
       this.mode = 'view'
+      this.generatePdfLoading = false
     },
   }
 }

src/views/modules/pickCard/card-user-purchase.vue

@@ -31,9 +31,10 @@
           <el-table-column align="center" fixed="right" :label="$t('publics.operating')" width="auto">
             <template slot-scope="scope">
               <div class="text-btn-con">
-                <div class="default-btn text-btn" @click="viewCardList(scope.row)">查看清单</div>
-                <div class="default-btn text-btn" @click="toCardLibPage(scope.row)">去选图</div>
+                <div class="default-btn text-btn" @click="viewCardList(scope.row)">详情</div>
+                <div class="default-btn text-btn" @click="toCardLibPage(scope.row)">选图</div>
                 <div class="default-btn text-btn" @click="addOrUpdateHandle(scope.row)">修改</div>
+                <div class="default-btn text-btn" @click="viewTableStat(scope.row)">统计</div>
                 </div>
             </template>
           </el-table-column>
@@ -69,6 +70,49 @@
         <div class="default-btn primary-btn" @click="cardUserPurchaseFormSubmit">确定</div>
       </span>
     </el-dialog>
+    <el-dialog top="1vh" title="清单统计详情" :close-on-click-modal="false" v-if="tableStatVisible" :visible.sync="tableStatVisible" width="40%">
+      <div>
+        <el-table
+          :data="tableStatData"
+          border
+          stripe
+          height="800"
+          :header-row-style="{fontSize: '20px', fontWeight: 'bold', color: 'blue'}"
+          :row-style="{fontSize: '16px', color: 'black'}"
+          style="width: 100%">
+          <el-table-column
+            prop="seq"
+            label="序号"
+            width="180">
+            <template slot-scope="scope">
+              <span>{{scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="seriesName"
+            label="团体组合"
+            width="180">
+            <template slot-scope="scope">
+              <span>{{scope.row.seriesName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="personName"
+            label="成员名称">
+            <template slot-scope="scope">
+              <span>{{scope.row.personName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="cardCount"
+            label="张数">
+            <template slot-scope="scope">
+              <span>{{scope.row.cardCount}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -88,9 +132,11 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
+      tableStatData: [],
       searchForm: {}, // 搜索
       dataListLoading: false,
       addOrUpdateVisible: false,
+      tableStatVisible: false,
       addOrUpdatePersonVisible: false,
       usageList:[],
       seriesList: [],
@@ -107,6 +153,22 @@ export default {
   mounted () {
   },
   methods: {
+    viewTableStat(row){
+      this.$http({
+        url: this.$http.adornUrl('/card/cardUserPurchase/tableStat'),
+        method: 'get',
+        params: this.$http.adornParams(
+          Object.assign({
+              size: 200,
+              id: row.id
+            }
+          )
+        )
+      }).then(({data}) => {
+        this.tableStatData = data
+      })
+      this.tableStatVisible = true
+    },
     cardUserPurchaseFormSubmit(){
       this.$http({
         url: this.$http.adornUrl('/card/cardUserPurchase'),

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

@@ -74,6 +74,10 @@
                     }}{{ dataForm.userAddrOrder.addr }}
                   </div>
                 </div>
+                <div class="item">
+                  <div class="text">快递单号：</div>
+                  <div class="res">{{ dataForm.deliveryNo }}</div>
+                </div>
               </div>
             </div>
             <div class="goods-list">

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

@@ -4,6 +4,17 @@
     <div class="search-bar">
       <el-form :inline="true" class="search-form" ref="searchForm" :model="searchForm" label-width="auto" size="small">
         <div class="input-row">
+          <el-form-item label="打印渠道" class="search-form-item">
+            <el-select
+              v-model="searchForm.printChannel"
+              clearable
+              placeholder="请选择打印渠道"
+              size="small">
+              <el-option key="KuaiYin" label="快印" value="KuaiYin"></el-option>
+              <el-option key="WoNiu" label="蜗牛" value="WoNiu"></el-option>
+              <el-option key="Lightning" label="闪电" value="Lightning"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="推广店铺" prop="shopId">
             <el-select v-model="searchForm.shopId" placeholder="推广店铺"
                        controls-position="right" :clearable="true">