1、更新

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

@@ -48,6 +48,7 @@
               <el-select
                 v-model="dataForm.prodName"
                 size="small"
+                filterable="true"
                 clearable
                 placeholder="产品名称">
                 <el-option key="yjxk" label="圆角小卡" value="圆角小卡"></el-option>
@@ -136,6 +137,8 @@
                 size="small">
                 <el-option key="1" label="400g" value="400g"></el-option>
                 <el-option key="2" label="350g" value="350g"></el-option>
+                <el-option key="3" label="500g" value="500g"></el-option>
+                <el-option key="4" label="1000g" value="1000g"></el-option>
               </el-select>
             </template>
           </el-form-item>

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

@@ -384,10 +384,24 @@
             <el-option key="V" label="UV光油" value="V"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="纸张" label-width="100px">
+          <el-select v-model="wave.paper">
+            <el-option key="HC" label="幻彩镭射" value="HCLS"></el-option>
+            <el-option key="BL" label="玻璃碎镭射" value="BLSLS"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="单双面" label-width="100px">
           <el-select v-model="wave.side">
             <el-option key="1" label="单面" value="1"></el-option>
             <el-option key="2" label="双面" value="2"></el-option>
+            <el-option key="3" label="对裱" value="3"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="正背面生成" label-width="100px">
+          <el-select v-model="wave.frontAndBack">
+            <el-option key="1" label="只生成正面" value="Front"></el-option>
+            <el-option key="2" label="只生成背面" value="Back"></el-option>
+            <el-option key="3" label="同时生成两面" value="Double"></el-option>
           </el-select>
         </el-form-item>
       </el-form>

src/views/modules/print/wave.vue

@@ -156,6 +156,7 @@
             align="center"
             label="生成时间"
             prop="createTime"
+            width="180px"
           >
             <template slot-scope="scope">
               <span>{{scope.row.createTime }}</span>
@@ -187,7 +188,15 @@
               <span v-else>未知</span>
             </template>
           </el-table-column>
-
+          <el-table-column
+            width="100px"
+            align="center"
+            prop="remark"
+            label="备注">
+            <template slot-scope="scope">
+              <span style="color: red">{{scope.row.remark}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             :label="$t('crud.menu')"
@@ -257,6 +266,8 @@
           <el-select v-model="modifyWave.gram">
             <el-option key="1" label="400g" value="400g"></el-option>
             <el-option key="2" label="350g" value="350g"></el-option>
+            <el-option key="3" label="500g" value="500g"></el-option>
+            <el-option key="4" label="1000g" value="1000g"></el-option>
           </el-select>
         </el-form-item>
       </el-form>