创作详情

src/views/wjnft/artist/index.vue

@@ -416,10 +416,7 @@
                                 this.$message.error("请填写创作者介绍")
                                 return;
                             }
-                            if (this.form.proportion === "" || this.form.proportion === null || this.form.proportion === undefined) {
-                                this.$message.error("请填写比例")
-                                return;
-                            }
+
                             if (this.form.artistName === "" || this.form.artistName === null || this.form.artistName === undefined) {
                                 this.$message.error("请填写作为创作者的名称")
                                 return;
@@ -438,10 +435,7 @@
                                 this.$message.error("请填写创作者介绍")
                                 return;
                             }
-                            if (this.form.proportion === "" || this.form.proportion === null || this.form.proportion === undefined) {
-                                this.$message.error("请填写比例")
-                                return;
-                            }
+
                             if (this.form.artistName === "" || this.form.artistName === null || this.form.artistName === undefined) {
                                 this.$message.error("请填写作为创作者的名称")
                                 return;

src/views/wjnft/collection/index.vue

@@ -311,11 +311,11 @@
 
       </el-table-column>
 <!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 <!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
 <!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
 <!--        <template slot-scope="scope">-->
@@ -323,7 +323,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <!--      <el-table-column label="预留" align="center" prop="reservedA" />-->
-      <!--      <el-table-column label="预留" align="center" prop="reservedB" />-->
+            <el-table-column label="热力值" align="center" prop="heatValue" />
       <!--      <el-table-column label="预留" align="center" prop="reservedC" />-->
       <!--      <el-table-column label="预留" align="center" prop="reservedD" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -813,7 +813,7 @@ export default {
         updatedBy: null,
         updatedTime: null,
         reservedA: null,
-        reservedB: null,
+        heatValue: null,
         reservedC: null,
         reservedD: null
       };

src/views/wjnft/feedback/index.vue

@@ -45,15 +45,15 @@
 <!--          placeholder="选择${comment}">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="${comment}" prop="createdBy">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createdBy"-->
-<!--          placeholder="请输入${comment}"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="反馈者" prop="createdBy">
+        <el-input
+          v-model="queryParams.createdBy"
+          placeholder="请输入反馈者名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="${comment}" prop="updatedTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--          v-model="queryParams.updatedTime"-->
@@ -137,7 +137,8 @@
       <el-table-column label="序号" type="index" width="50"></el-table-column>
 <!--      <el-table-column label="手机" align="center" prop="phone" width="150"/>-->
       <el-table-column label="标题" align="center" prop="title" width="200"/>
-      <el-table-column label="内容" align="center" prop="content" width="600"/>
+      <el-table-column label="内容" align="center" prop="content" width="400"/>
+      <el-table-column label="回复内容" align="center" prop="admContent" width="400"/>
 <!--      <el-table-column label="用户ID" align="center" prop="userId" />-->
 <!--      <el-table-column label="附件图片" align="center" prop="picture" />-->
       <el-table-column label="附件图片" align="center" prop="picture" >
@@ -165,7 +166,7 @@
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="反馈人" align="center" prop="createdBy" width="100"/>
+      <el-table-column label="反馈者" align="center" prop="createdBy" width="100"/>
 <!--      <el-table-column label="${comment}" align="center" prop="updatedTime" width="180">-->
 <!--        <template slot-scope="scope">-->
 <!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
@@ -184,7 +185,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wjnft:feedback:edit']"
+            v-if="scope.row.admContent==null"
           >回复</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -221,7 +222,7 @@
           <el-input
               type="textarea"
               :rows="8"
-              v-model="form.return">
+              v-model="form.admContent">
           </el-input>
         </el-form-item>
 <!--        <el-form-item label="手机" prop="phone">-->