1、取消发货

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

@@ -308,6 +308,11 @@
                       v-else-if="order.status === 4"
                       type="warning"
                     >异常</el-tag>
+                    <el-tag
+                      v-if="order.status === 11"
+                      type="info"
+                    >已取消</el-tag
+                    >
                   </span>
                 </div>
               </el-col>
@@ -323,15 +328,22 @@
                   <div class="operate">
                     <div
                       class="default-btn text-btn operate-btn"
-                      @click="openPrintOrderDialog(order.orderNumber)">详情</div>
+                      @click="openPrintOrderDialog(order.orderNumber)">详情
+                    </div>
                     <div
                       class="default-btn text-btn operate-btn"
                       @click="updateStatus(order, 4)"
-                      v-if="order.status === 1">标记异常</div>
+                      v-if="order.status === 1">标记异常
+                    </div>
                     <div
                       class="default-btn text-btn operate-btn"
                       @click="updateStatus(order, 1)"
-                      v-if="order.status === 4">标记正常</div>
+                      v-if="order.status === 4">标记正常
+                    </div>
+                    <div
+                      class="default-btn text-btn operate-btn"
+                      @click="updateStatus(order, 11)">取消订单
+                    </div>
                   </div>
                 </div>
               </el-col>
@@ -471,6 +483,10 @@
             value: 4,
             label: "异常"
           },
+          {
+            value: 11,
+            label: "已取消"
+          },
           ],
         refund: [
           {
@@ -656,13 +672,13 @@
         }).then(({data}) => {
           if(data){
             this.$message({
-              message: "标记成功",
+              message: "操作成功",
               type: 'success'
             })
             this.getDataList(this.page, null, false);
           }else{
             this.$message({
-              message: "标记失败",
+              message: "操作失败",
               type: 'error'
             })
           }

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

@@ -229,6 +229,7 @@
                   <span v-if="scope.row.status == 1">待打印</span>
                   <span v-if="scope.row.status == 2">待发货</span>
                   <span v-if="scope.row.status == 3">已发货</span>
+                  <span v-if="scope.row.status == 11">已取消</span>
                 </template>
               </el-table-column>
               <el-table-column

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

@@ -23,7 +23,7 @@
           <el-option key="stub" label="票根" value="stub"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="模板风格" prop="templateStyle">
+      <!--<el-form-item label="模板风格" prop="templateStyle">
         <el-select v-model="dataForm.templateStyleId" clearable filterable>
           <el-option
                   v-for="node in styleList"
@@ -42,7 +42,7 @@
                   :value="node.seriesId"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="模板图片" prop="templatePic">
         <img-upload v-model="dataForm.templatePic" :limit="20"></img-upload>
       </el-form-item>

src/views/modules/prod/prodTemplate.vue

@@ -5,7 +5,7 @@
       <el-form :inline="true" class="search-form" ref="searchForm" :model="searchForm" label-width="auto" size="small">
         <!-- 表单项 -->
         <div class="input-row">
-          <el-form-item prop="templateStyleId" :label="$t('prodTemplate.templateStyle')+':'">
+          <!--<el-form-item prop="templateStyleId" :label="$t('prodTemplate.templateStyle')+':'">
             <el-select v-model="searchForm.templateStyleId" clearable filterable>
               <el-option
                       v-for="node in styleList"
@@ -14,8 +14,8 @@
                       :value="node.styleId"
               ></el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item prop="templateSeriesId" :label="$t('prodTemplate.templateSeries')+':'">
+          </el-form-item>-->
+          <!--<el-form-item prop="templateSeriesId" :label="$t('prodTemplate.templateSeries')+':'">
             <el-select v-model="searchForm.templateSeriesId" clearable filterable>
               <el-option
                       v-for="node in seriesList"
@@ -24,7 +24,7 @@
                       :value="node.seriesId"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item>
             <div class="default-btn primary-btn" @click="searchChange()">{{ $t('crud.searchBtn') }}</div>
             <div class="default-btn" @click="resetForm()">{{ $t('shop.resetMap') }}</div>
@@ -67,17 +67,17 @@
             </template>
           </el-table-column>
           <!-- 模板风格 -->
-          <el-table-column :label="$t('prodTemplate.templateStyle')" prop="templateStyle" align="center">
+          <!--<el-table-column :label="$t('prodTemplate.templateStyle')" prop="templateStyle" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.templateStyle}}</span>
             </template>
           </el-table-column>
-          <!-- 模板下风格的系列，比如二次元风格的海贼王系列 -->
+          &lt;!&ndash; 模板下风格的系列，比如二次元风格的海贼王系列 &ndash;&gt;
           <el-table-column :label="$t('prodTemplate.templateSeries')" prop="templateSeries" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.templateSeries}}</span>
             </template>
-          </el-table-column>
+          </el-table-column>-->
           <el-table-column :label="$t('prodTemplate.templateUsage')" prop="usageList" align="center">
             <template slot-scope="scope">
               <div class="table-cell-text">{{ scope.row.usageList != null? scope.row.usageList.join('/'): "" }}</div>