1、修复模板

src/components/AudioBox/index.vue

@@ -462,7 +462,7 @@ export default {
       formdata.append('FileName', file.name)
       formdata.append('file', file)
       this.$http({
-        url: this.$http.adornUrl('/admin/file/upload/element'),
+        url: this.$http.adornUrl('/admin/file/upload/audio'),
         method: 'post',
         headers: {
           'Content-Type': file.type

src/views/modules/order/order.vue

@@ -21,6 +21,8 @@
           <el-form-item label="产品名称"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <template>
               <el-select
+                filterable
+                allow-create
                 v-model="dataForm.prodName"
                 size="small"
                 clearable
@@ -40,6 +42,7 @@
                 <el-option key="sf" label="手幅" value="手幅"></el-option>
                 <el-option key="tz" label="贴纸" value="贴纸"></el-option>
                 <el-option key="zy" label="自印" value="自印"></el-option>
+                <el-option key="ZJK" label="直角卡" value="直角卡"></el-option>
               </el-select>
             </template>
           </el-form-item>

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

@@ -29,6 +29,7 @@
           <el-option key="3CFZFP" label="3寸仿真拍立得" value="3CFZFP"></el-option>
           <el-option key="4CFZFP" label="4寸仿真拍立得" value="4CFZFP"></el-option>
           <el-option key="5CFZFP" label="5寸仿真拍立得" value="5CFZFP"></el-option>
+          <el-option key="YYK" label="语音卡" value="YYYXK,YYZJXK"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="模板风格" prop="templateStyle">
@@ -137,7 +138,7 @@ export default {
       return new Promise((resolve, reject) => {
         let image = new Image();
         image.onload = function() {
-          if(templateUsage.indexOf("smallcard") !== -1 || templateUsage.indexOf("polaroid") !== -1){
+          if(templateUsage.indexOf("smallcard") !== -1 || templateUsage.indexOf("polaroid") !== -1 || templateUsage.indexOf("YYYXK") || templateUsage.indexOf("YYZJXK")){
             width = 709;
             height = 1087;
           }else if(templateUsage.indexOf("stub") !== -1 || templateUsage.indexOf("PG") !== -1){

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

@@ -7,6 +7,27 @@
       <el-form-item label="系列名称" prop="seriesName">
         <el-input v-model="dataForm.seriesName"></el-input>
       </el-form-item>
+      <el-form-item label="模板用途" prop="seriesUsage">
+        <el-select v-model="usageList" clearable filterable multiple>
+          <el-option key="smallcard" label="小卡" value="smallcard,YXK,ZJXK,DBYXK,DBZJXK,YYYXK,YYZJXK"></el-option>
+          <el-option key="squarecard" label="大方卡" value="squarecard,FK"></el-option>
+          <el-option key="XFK" label="小方卡" value="XFK"></el-option>
+          <el-option key="badge" label="徽章" value="badge,HZ"></el-option>
+          <el-option key="postcard" label="明信片" value="postcard,MXP,YSZMXP"></el-option>
+          <el-option key="bookmark" label="书签" value="bookmark,SQ"></el-option>
+          <el-option key="tipscard" label="手幅" value="tipscard,SF"></el-option>
+          <el-option key="covercard" label="直拍封面" value="covercard,ZP"></el-option>
+          <el-option key="stub" label="票根" value="stub,PG"></el-option>
+          <el-option key="FP" label="3寸花式拍立得" value="FP,polaroid"></el-option>
+          <el-option key="4CFP" label="4寸花式拍立得" value="4CFP"></el-option>
+          <el-option key="5CFP" label="5寸花式拍立得" value="5CFP"></el-option>
+          <el-option key="SBSGG" label="竖版四宫格" value="SBSGG"></el-option>
+          <el-option key="TZSGG" label="田字四宫格" value="TZSGG"></el-option>
+          <el-option key="3CFZFP" label="3寸仿真拍立得" value="3CFZFP"></el-option>
+          <el-option key="4CFZFP" label="4寸仿真拍立得" value="4CFZFP"></el-option>
+          <el-option key="5CFZFP" label="5寸仿真拍立得" value="5CFZFP"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="排序" prop="seq">
         <el-input v-model="dataForm.seq" type="number"></el-input>
       </el-form-item>
@@ -28,6 +49,7 @@ export default {
         seriesName: null,
         shopId: this.$store.state.user.shopId
       },
+      usageList:[],
       dataRule: {
       }
     }
@@ -45,6 +67,7 @@ export default {
             params: this.$http.adornParams()
           }).then(({data}) => {
             this.dataForm = data
+            this.usageList = data.templateUsage.split(",")
           })
         }
       })
@@ -53,6 +76,7 @@ export default {
     dataFormSubmit () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.dataForm.seriesUsage = this.usageList.join(",");
           this.$http({
             url: this.$http.adornUrl('/prod/prodTemplateSeries'),
             method: this.dataForm.seriesId ? 'put' : 'post',

src/views/modules/prod/prodTemplateSeries.vue

@@ -33,6 +33,12 @@
               <span>{{ scope.row.seriesName}}</span>
             </template>
           </el-table-column>
+          <!-- 系列用途 -->
+          <el-table-column label="系列用途" prop="usageList" align="center" width="600px">
+            <template slot-scope="scope">
+              <div class="table-cell-text">{{ scope.row.usageList != null? scope.row.usageList.join('/'): "" }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="排序" prop="seq" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.seq}}</span>
@@ -78,7 +84,8 @@ export default {
       },
       searchForm: {}, // 搜索
       dataListLoading: false,
-      addOrUpdateVisible: false
+      addOrUpdateVisible: false,
+      usageList:[],
     }
   },
   components: {

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

@@ -14,6 +14,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="语音名称" prop="templateName">
+        <el-input v-model="dataForm.templateName"/>
+      </el-form-item>
       <el-form-item label="语音地址" prop="templateUrl">
         <audio-upload v-model="dataForm.templateUrl" :limit="1"></audio-upload>
       </el-form-item>
@@ -53,7 +56,8 @@ export default {
         status: 1,
         createTime: null,
         templateUsage: null,
-        seq: 1
+        seq: 1,
+        templateName: null
       },
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
       seriesList: [],

src/views/modules/prod/voiceTemplate.vue

@@ -49,7 +49,11 @@
               />
             </template>
           </el-table-column>
-
+          <el-table-column label="语音名称" prop="templateName" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.templateName}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="模版系列" prop="templateSeries" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.templateSeries}}</span>

src/views/modules/resource/audio-store/upload-audio.vue

@@ -108,7 +108,7 @@ export default {
       errShow: false,
       picNum: 0,
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
-      type: 2,
+      type: 4,
       fileName: '',
       listType: 'picture',
       isLoading: true,