优化页面

src/views/wjnft/artist/index.vue

@@ -177,7 +177,7 @@
                     prop="identifier"
                     align="center"
                     label="标识">
-                <template scope="scope">
+                <template slot-scope="scope">
                     {{ scope.row.identifier === 1 ? '创作者': '' }}
                     {{ scope.row.identifier === 2 ? '商家': '' }}
                 </template>

src/views/wjnft/collection/index.vue

@@ -338,7 +338,7 @@
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasRole="['admin','tester','shop','artist']"
-          >修改</el-button>
+          >修改</el-button><br>
           <el-button
               size="mini"
               type="text"

src/views/wjnft/macketingapplication/index.vue

@@ -130,7 +130,7 @@
 
     <!-- 添加或修改活动申请 对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="活动名称" prop="macketingActivitiesId">
 <!--          <el-input v-model="form.macketingActivitiesId" placeholder="请选择活动名称" />-->
             <el-select v-model="form.macketingActivitiesId" clearable placeholder="请选择活动名称" >
@@ -212,25 +212,30 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        // 'blur'是鼠标失去焦点的时候会触发验证
+        macketingActivitiesId: [ { required: true, message: '请选择活动名称' }],
+        collectionId: [ { required: true, message: '请选择作品' }],
+        collectionNumber: [ {  required: true, message: '请输入数量', trigger: 'change'}],
       }
     };
   },
   created() {
     this.getList();
-    this.queryActivity();
-    this.production();
+    // this.queryActivity();
+    // this.production();
   },
   methods: {
 
     /*** 查询藏品*/
     production(){
+      this.worksCollection = [];
       getProduction().then(rest =>{
        // console.log(rest.data);
         let est = rest.data;
         est.forEach( re =>{
           let nub = {
             id:re.id,
-            collectionName: re.collectionName +"——剩余 "+re.quantityIssued+"个"
+            collectionName: re.collectionName +"——剩余 "+re.numberRemaining+"个"
           }
           this.worksCollection.push(nub);
         } )
@@ -243,6 +248,7 @@ export default {
      * 查询活动名称
      */
      queryActivity(){
+      this.activity = [];
       getQueryActivity().then(rest =>{
         //console.log(rest.data);
         let sets = rest.data;
@@ -309,6 +315,8 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加活动作品 ";
+      this.queryActivity();
+      this.production();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/wjnft/series/index.vue

@@ -109,7 +109,7 @@
           prop="type"
           align="center"
           label="作品类型">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{ scope.row.type === 'AX' ?  '图片': '' }}
           {{ scope.row.type === 'BX' ?  '摄影作品': '' }}
           {{ scope.row.type === 'CX' ?  '动图': '' }}
@@ -182,9 +182,9 @@
             <el-option label="其他" value="ZX"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-        </el-form-item>
+<!--        <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="创建时间" prop="createdTime">-->
 <!--          <el-date-picker clearable size="small"-->
 <!--            v-model="form.createdTime"-->
@@ -342,10 +342,10 @@ export default {
               this.$message.error("请填写系列名称")
               return ;
             }
-            if (this.form.createdBy === "" ||this.form.createdBy === null ||this.form.createdBy === undefined ){
-              this.$message.error("请填写创建人")
-              return ;
-            }
+            // if (this.form.createdBy === "" ||this.form.createdBy === null ||this.form.createdBy === undefined ){
+            //   this.$message.error("请填写创建人")
+            //   return ;
+            // }
             addSeries(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;