huangmp %!s(int64=2) %!d(string=hai) anos
pai
achega
75f74853a9

+ 1 - 0
src/views/modules/order/order.vue

@@ -29,6 +29,7 @@
                 <el-option key="wxzj" label="无双直角小卡" value="无双直角小卡"></el-option>
                 <el-option key="yjxk" label="典藏圆角小卡" value="典藏圆角小卡"></el-option>
                 <el-option key="zjxk" label="典藏直角小卡" value="典藏直角小卡"></el-option>
+                <el-option key="pld" 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>

+ 1 - 0
src/views/modules/print/print-order.vue

@@ -39,6 +39,7 @@
                 placeholder="产品名称">
                 <el-option key="yjxk" label="圆角小卡" value="圆角小卡"></el-option>
                 <el-option key="zjxk" label="直角小卡" value="直角小卡"></el-option>
+                <el-option key="pld" 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>

+ 3 - 0
src/views/modules/prod/prodTemplateSeries-add-or-update.vue

@@ -7,6 +7,9 @@
       <el-form-item label="系列名称" prop="seriesName">
         <el-input v-model="dataForm.seriesName"></el-input>
       </el-form-item>
+      <el-form-item label="排序" prop="seq">
+        <el-input v-model="dataForm.seq" type="number"></el-input>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button class="default-btn" @click="visible = false">{{$t("crud.filter.cancelBtn")}}</el-button>

+ 5 - 6
src/views/modules/prod/prodTemplateSeries.vue

@@ -33,12 +33,11 @@
               <span>{{ scope.row.seriesName}}</span>
             </template>
           </el-table-column>
-          <!-- 商家ID -->
-<!--          <el-table-column :label="$t('prodTemplateSeries.shopId')" prop="shopId" align="center">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span>{{ scope.row.shopId}}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <el-table-column label="排序" prop="seq" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.seq}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" fixed="right" :label="$t('publics.operating')" width="auto">
             <template slot-scope="scope">
               <div class="text-btn-con">