1、波次名称自动化

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

@@ -206,6 +206,9 @@
           }else if(prodName.indexOf("5寸直角卡") !== -1){
             width = 1087;
             height = 1347;
+          }else if(prodName.indexOf("63x108") !== -1){
+            width = 874;
+            height = 1287;
           }
           let _URL = window.URL || window.webkitURL;
           let img = new Image();

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

@@ -51,6 +51,7 @@
                 <el-option key="sgg" label="四宫格" value="四宫格"></el-option>
                 <el-option key="pld" label="拍立得" value="拍立得"></el-option>
                 <el-option key="zpfm" label="直拍封面" value="直拍封面"></el-option>
+                <el-option key="lsp" label="镭射票" value="镭射票"></el-option>
                 <el-option key="sq" label="书签" value="书签"></el-option>
                 <el-option key="mxp" label="明信片" value="明信片"></el-option>
                 <el-option key="fk" label="方卡" value="方卡"></el-option>
@@ -62,21 +63,21 @@
           <el-form-item label="覆膜工艺"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <template>
               <el-select
-                v-model="dataForm.skuName"
+                v-model="dataForm.thirdSkuNo"
                 size="small"
                 clearable
                 placeholder="覆膜工艺">
-                <el-option key="lm" label="镜面膜" value="镜面"></el-option>
-                <el-option key="ym" label="哑膜" value="哑膜"></el-option>
-                <el-option key="ls" label="镭射" value="镭射"></el-option>
-                <el-option key="mtx" label="满天星" value="满天星"></el-option>
-                <el-option key="axm" label="爱心膜" value="爱心膜"></el-option>
+                <el-option key="lm" label="镜面膜" value="21"></el-option>
+                <el-option key="ym" label="哑膜" value="2"></el-option>
+                <el-option key="ls" label="镭射" value="4"></el-option>
+                <el-option key="mtx" label="满天星" value="5"></el-option>
+                <el-option key="axm" label="爱心膜" value="23"></el-option>
 <!--                <el-option key="bls" label="玻璃碎" value="玻璃碎"></el-option>-->
 <!--                <el-option key="zgz" label="珠光" value="珠光"></el-option>-->
-                <el-option key="xx" label="星星" value="星星"></el-option>
-                <el-option key="szxs" label="十字星闪" value="十字星闪"></el-option>
-                <el-option key="wjx" label="五角旗星" value="五角旗星"></el-option>
-                <el-option key="yhm" label="烟花膜" value="烟花膜"></el-option>
+                <el-option key="xx" label="星星" value="22"></el-option>
+                <el-option key="szxs" label="十字星闪" value="102"></el-option>
+                <el-option key="wjx" label="五角旗星" value="101"></el-option>
+                <el-option key="yhm" label="烟花膜" value="100"></el-option>
               </el-select>
             </template>
           </el-form-item>
@@ -424,7 +425,7 @@
           <span autocomplete="off">{{dataListSelections.size}}</span>
         </el-form-item>
         <el-form-item label="色数" label-width="100px">
-          <el-select v-model="wave.colorPrint">
+          <el-select v-model="wave.colorPrint" @change="buildWaveName">
             <el-option key="YX" label="影像级" value="8"></el-option>
             <el-option key="LS" label="六色" value="6"></el-option>
             <el-option key="SS" label="四色" value="4"></el-option>
@@ -436,6 +437,28 @@
             <el-option key="2" label="350g" value="350g"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="产品" label-width="100px">
+          <el-select v-model="wave.prodName" @change="buildWaveName">
+            <el-option key="1" label="圆角小卡" value="圆角"></el-option>
+            <el-option key="2" label="直角" value="直角"></el-option>
+            <el-option key="3" label="直拍" value="直拍"></el-option>
+            <el-option key="4" label="混合" value="混合"></el-option>
+            <el-option key="5" label="镭射票" value="镭射票"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺" label-width="100px">
+          <el-select v-model="wave.skuName" @change="buildWaveName">
+            <el-option key="1" label="光膜" value="光膜"></el-option>
+            <el-option key="2" label="哑膜" value="哑膜"></el-option>
+            <el-option key="3" label="镭射" value="镭射"></el-option>
+            <el-option key="4" label="满天星" value="满天星"></el-option>
+            <el-option key="5" label="星星" value="星星"></el-option>
+            <el-option key="6" label="爱心" value="爱心"></el-option>
+            <el-option key="7" label="烟花" value="烟花"></el-option>
+            <el-option key="8" label="五角星" value="五角星"></el-option>
+            <el-option key="9" label="十字膜" value="十字膜"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="createWave">生 成</el-button>
@@ -752,6 +775,29 @@
           }
         })
       },
+      buildWaveName(){
+        let shopName = "";
+        let date = new Date();
+        let dateStr = (date.getMonth() + 1)+ "." + date.getDate();
+        let bc = this.wave.waveNo.substring(this.wave.waveNo.length - 2);
+        if(bc.startsWith("0")){
+          bc = bc.replace("0", "");
+        }
+        if(this.shopId !== 1){
+          if(this.shopId === 2){
+            shopName = "YT"
+          }else if(this.shopId === 6){
+            shopName = "FQ"
+          }
+        }
+        let sheets = (this.selectSheets / 10);
+        if(Number.isInteger(sheets)){
+
+        }else{
+          sheets = sheets.toFixed(1);
+        }
+        this.wave.waveName = dateStr + "-" + (shopName? (shopName + "-"): "") + (this.wave.colorPrint !== '8'? "4S-":"") + this.wave.prodName + "-" + this.wave.skuName + "-" + sheets + "套" + "-" + "BC" + bc
+      },
       createWave(){
         let dataBody = {colorPrint: this.wave.colorPrint, gram: this.wave.gram, waveName: this.wave.waveName, "orderNumberList": [...this.dataListSelections], "printChannel": this.printChannel};
         this.$http({
@@ -898,7 +944,7 @@
             'prodName': this.dataForm.prodName, // 产品名称
             'isMerge': this.dataForm.isMerge, // 是否合单
             'printChannel': this.printChannel,
-            'skuName': this.dataForm.skuName,
+            'thirdSkuNo': this.dataForm.thirdSkuNo,
             'prodNums': this.dataForm.prodNums,
             'deliveryNo': this.dataForm.deliveryNo,
             'isPromotion': this.dataForm.isPromotion,

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

@@ -321,6 +321,7 @@
           <el-select v-model="printOrder.deliveryCode" :clearable="true" @change="handleDeliveryChange">
             <el-option key="ZTO" label="中通快递" value="ZTO"></el-option>
             <el-option key="YUNDA" label="韵达速递" value="YUNDA"></el-option>
+            <el-option key="SF" label="顺丰快递" value="SF"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="快递名称" label-width="70px">
@@ -534,6 +535,8 @@
           this.printOrder.deliveryName = '韵达速递';
         }else if(delivery === 'STO'){
           this.printOrder.deliveryName = '申通快递';
+        }else if(delivery === 'SF'){
+          this.printOrder.deliveryName = '顺丰快递';
         }
       },
       openWaveStatDialog(waveId){

src/views/modules/print/wave.vue

@@ -142,7 +142,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="orderNum"
+            prop="colorPrint"
             width="100px"
             label="打印色数"
           >
@@ -154,7 +154,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="orderNum"
+            prop="gram"
             width="100px"
             label="打印克数"
           >

src/views/modules/seckill/new-seckill.vue

@@ -25,7 +25,7 @@
           style="width: 400px"
           maxlength="36"
           show-word-limit
-          :disabled="!!dataForm.seckillId"
+          :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
         ></el-input>
       </el-form-item>
       <el-form-item
@@ -40,7 +40,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :start-placeholder="this.$i18n.t('time.start')"
           :end-placeholder="this.$i18n.t('time.end')"
-          :disabled="!!dataForm.seckillId"
+          :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
         ></el-date-picker>
       </el-form-item>
 
@@ -58,7 +58,7 @@
         <el-checkbox
           v-model="hasMaxNum"
           @click="handlerChangeMaxNum"
-          :disabled="!!dataForm.seckillId"
+          :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
           >{{ $t("seckill.openPurchaseLimit") }}</el-checkbox
         >
         <span v-show="hasMaxNum">
@@ -69,7 +69,7 @@
             :min="1"
             :max="1000"
             style="width: 100px"
-            :disabled="!!dataForm.seckillId"
+            :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
           ></el-input-number
           >{{ $t("marketing.item") }}
         </span>
@@ -85,7 +85,7 @@
           :max="15"
           controls-position="right"
           style="width: 100px"
-          :disabled="!!dataForm.seckillId"
+          :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
         ></el-input-number
         >&nbsp;&nbsp;{{ $t("seckill.unpaidnutes") }}
       </el-form-item>
@@ -95,7 +95,7 @@
           @click="prodsSelectHandle()"
           style="float: left"
           class="default-btn"
-          v-if="!dataForm.seckillId && prod === null"
+          v-if="(!dataForm.seckillId && prod === null) || viewOrEdit === 'edit'"
           >{{ $t("product.select") }}</div>
         <el-alert
           :title="this.$i18n.t('seckill.warning')"
@@ -117,10 +117,10 @@
           <div class="card-prod-bottom">
             <span class="card-prod-name">{{ prod.prodName }}</span>
             <el-button
-              v-if="prod.status !== -1 && !dataForm.seckillId"
+              v-if="prod.status !== -1 && !dataForm.seckillId || viewOrEdit === 'edit'"
               type="text"
               class="card-prod-name-button"
-              :disabled="!!dataForm.seckillId"
+              :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
               @click="deleteProd"
               >{{ $t("text.delBtn") }}</el-button
             >
@@ -155,7 +155,7 @@
             <el-form-item :label="this.$i18n.t('marketing.activeInventory')">
               <el-input-number v-model="dataForm.stocks"
                   controls-position="right"
-                  :disabled="isCompose == 1"
+                  :disabled="isCompose == 1 "
                   size="small"
                   :precision="0"
                   :max="9999999"
@@ -197,7 +197,7 @@
                 size="small"
                 :max="scope.row.price"
                 v-model="scope.row.seckillPrice"
-                :disabled="!!(!scope.row.status || dataForm.seckillId)"
+                :disabled="!!(!scope.row.status || dataForm.seckillId) && viewOrEdit === 'view'"
               ></el-input-number>
               <div>{{ $t("seckill.price") }}{{ scope.row.price }}</div>
             </template>
@@ -215,7 +215,7 @@
                 :min="0"
                 :max="9999999"
                 size="small"
-                :disabled="!!(!scope.row.status || dataForm.seckillId)"
+                :disabled="!!(!scope.row.status || dataForm.seckillId) && viewOrEdit === 'view'"
               ></el-input-number>
               <div>{{ $t("seckill.exisocks") }}{{ scope.row.stocks }}</div>
             </template>
@@ -227,7 +227,7 @@
                 type="text"
                 size="small"
                 @click="changeSkuStatus(`${scope.$index}`)"
-                :disabled="!!dataForm.seckillId"
+                :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
                 v-if="scope.row.status"
                 >{{ $t("publics.disable") }}
                 </el-button
@@ -236,7 +236,7 @@
                 type="text"
                 size="small"
                 @click="changeSkuStatus(`${scope.$index}`)"
-                :disabled="!!dataForm.seckillId"
+                :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
                 v-else
                 >{{ $t("shop.ena") }}</el-button
               >
@@ -246,7 +246,7 @@
                 type="text"
                 size="small"
                 @click="changeSkuStatus(`${scope.$index}`)"
-                :disabled="!!dataForm.seckillId"
+                :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
                 v-if="!scope.row.seckillPrice"
                 >{{ $t("publics.disable") }}
                 </el-button
@@ -255,7 +255,7 @@
                 type="text"
                 size="small"
                 @click="changeSkuStatus(`${scope.$index}`)"
-                :disabled="!!dataForm.seckillId"
+                :disabled="!!dataForm.seckillId && viewOrEdit === 'view'"
                 v-else
                 >{{ $t("shop.ena") }}</el-button
               >
@@ -269,12 +269,20 @@
         $t("crud.filter.cancelBtn")
         }}</div>
         <div
+          v-if="viewOrEdit === 'view'"
           type="primary"
           class="default-btn primary-btn"
           :class="[!!dataForm.seckillId?'disabled-btn':'','default-btn primary-btn']"
           @click="dataFormSubmit(!!dataForm.seckillId)"
           >{{ $t("crud.filter.submitBtn") }}</div
         >
+        <div
+          v-if="viewOrEdit === 'edit'"
+          type="primary"
+          class="default-btn primary-btn"
+          @click="dataFormSubmit(!!dataForm.seckillId && viewOrEdit !== 'edit')"
+        >更新秒杀</div
+        >
       </el-form-item>
     </el-form>
     <!-- 商品选择弹窗 -->
@@ -305,6 +313,7 @@ export default {
       }
     }
     return {
+      viewOrEdit: "view",
       prodsSelectVisible: false,
       hasMaxNum: false,
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
@@ -349,6 +358,7 @@ export default {
   },
   mounted () {
     const seckillId = this.$route.query.seckillId
+    this.viewOrEdit = this.$route.query.viewOrEdit
     this.init(seckillId)
     let title = !seckillId ? this.$i18n.t('seckill.newSeckill') : this.$i18n.t('seckill.viewSeckill')
     this.$store.commit('common/replaceSelectMenu', title)
@@ -409,6 +419,9 @@ export default {
                 sku.seckillStocks = seckillSku.seckillStocks
                 sku.seckillPrice = seckillSku.seckillPrice
               }
+              if(seckillSku.seckillSkuId){
+                sku.seckillSkuId = seckillSku.seckillSkuId
+              }
             })
           })
         }
@@ -448,7 +461,7 @@ export default {
         return
       }
       // 秒杀不能更新
-      if (this.dataForm.seckillId) {
+      if (this.dataForm.seckillId && this.viewOrEdit !== 'edit') {
         this.back()
         return
       }
@@ -479,13 +492,13 @@ export default {
           paramData.hasMaxNum = this.hasMaxNum ? 1 : 0
           this.$http({
             url: this.$http.adornUrl('/seckill/seckill'),
-            method: 'post',
+            method: this.dataForm.seckillId ? 'put' : 'post',
             data: this.$http.adornData(paramData)
           }).then(({ data }) => {
             this.$message({
               message: this.$i18n.t('publics.operation'),
               type: 'success',
-              duration: 1500,
+              duration: 1000,
               onClose: () => {
                 this.back()
                 this.$emit('refreshDataList')

src/views/modules/seckill/seckill.vue

@@ -97,6 +97,11 @@
                   @click="addOrUpdateHandle(scope.row.seckillId)"
                   >{{ $t("live.view") }}
                 </div>
+                <div
+                  class="default-btn text-btn"
+                  @click="addOrUpdateHandle(scope.row.seckillId, 'edit')"
+                >编辑
+                </div>
                 <div
                   class="default-btn text-btn"
                   v-if="isAuth('seckill:seckill:invalid') && scope.row.status === 1"
@@ -239,11 +244,12 @@ export default {
       })
     },
     // 新增 / 修改
-    addOrUpdateHandle (id) {
+    addOrUpdateHandle (id, viewOrEdit = 'view') {
       this.$router.push({
         path: '/seckill-new-seckill',
         query: {
-          seckillId: id
+          seckillId: id,
+          viewOrEdit: viewOrEdit
         }
       })
     },

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

@@ -197,7 +197,7 @@
           <el-table-column
             align="center"
             width="110px"
-            :label="employeeId === 43? '打包快递结算金额(按件2.55元)':'人工结算金额(按件0.4元)'"
+            :label="(employeeId === 43 || searchForm.printChannel === 'Lightning')? '打包快递结算金额(按件2.55元)':'人工结算金额(按件0.4元)'"
             prop="settleLaborAmount">
             <template slot-scope="scope">
               <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount }}</span>
@@ -222,7 +222,7 @@
               <span style="color: red; font-weight: bold;font-size: 16px">-{{scope.row.settleAfterSalesCostAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!--<el-table-column
             v-if="employeeType === 0"
             align="center"
             label="售后结算金额"
@@ -230,7 +230,7 @@
             <template slot-scope="scope">
               <span style="color: red; font-weight: bold;font-size: 16px">-{{scope.row.settleAfterSalesAmount }}</span>
             </template>
-          </el-table-column>
+          </el-table-column>-->
           <el-table-column
             align="center"
             prop="settleOrderNums"
@@ -283,9 +283,9 @@
           <el-table-column
             align="center"
             :label="$t('crud.menu')"
-            width="160">
+            width="200">
             <template slot-scope="scope">
-              <div style="display: inline-block;float: left;">
+              <div style="display: inline-block;float: left">
               </div>
               <div
                 class="default-btn text-btn"
@@ -300,6 +300,11 @@
                 v-if="employeeType === 0"
                 class="default-btn text-btn"
                 @click="syncSettlement(scope.row)">更新</div>
+              <div
+                v-if="employeeType === 0"
+                class="default-btn text-btn"
+                style="color: red"
+                @click="deleteSettlement(scope.row)">删除</div>
               <br/>
               <div
                 v-if="employeeType === 0"