Merge remote-tracking branch 'origin/build' into build

project/fengdu/AppOutSource/AppArchives/components/List.vue

@@ -124,8 +124,16 @@
     <ai-dialog title="二维码"
                :visible.sync="dialog"
                :destroyOnClose="true"
+               customFooter
                width="720px">
+      <div class="flex-center">
         <img :src="qrSrc" class="qr-img" alt="">
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialog=false">关闭</el-button>
+        </div>
+      </template>
     </ai-dialog>
 
     <ai-dialog title="选择片区" :visible.sync="district" :customFooter="true" border width="720px">
@@ -390,4 +398,11 @@ export default {
     cursor: pointer;
   }
 }
+
+:deep(.flex-center){
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

project/fengdu/AppOutSource/AppMarkRate/components/Detail.vue

@@ -37,14 +37,14 @@
             class="mt-16"
             :tableData="tableData1"
             :is-show-pagination="false"
-            :col-configs="colConfigs1">
+            :col-configs="colConfigs">
         </ai-table>
         <label class="aibar-left">2、负面清单</label>
         <ai-table
             class="mt-16"
             :tableData="tableData2"
             :is-show-pagination="false"
-            :col-configs="colConfigs2">
+            :col-configs="colConfigs">
         </ai-table>
       </ai-card>
     </template>
@@ -65,37 +65,44 @@ export default {
         fileList: []
       },
       tableData1: [],
-      colConfigs1:[
+      colConfigs: [
-        { prop: 'integralUserName',  label: '清单类型', align: 'center' },
+        {prop: 'listType', label: '清单类型', align: 'center'},
-        { prop: 'areaName',  label: '状态', align: 'center' },
+        {
-        { prop: 'girdName',  label: '分数', align: 'center' },
+          prop: 'status', label: '状态', align: 'center', render: (h, {row}) => {
+            if (row.status === '1') {
+              return h('i', {
+                class: "el-icon-circle-check",
+                style: 'font-size:18px'
+              })
+            }
+            return ''
+          }
+        },
+        {prop: 'score', label: '分数', align: 'center'},
       ],
       tableData2: [],
-      colConfigs2:[
-        { prop: 'integralUserName',  label: '清单类型', align: 'center' },
-        { prop: 'areaName',  label: '状态', align: 'center' },
-        { prop: 'girdName',  label: '分数', align: 'center' },
-      ]
     }
   },
 
   created() {
     this.$dict.load('evaluatorType').then(() => {
       this.getDetail()
-      this.getScoredetail()
+      this.getList()
     })
   },
 
   methods: {
-    async getScoredetail(){
+    async getList() {
       try {
-        const {code,data} = await this.instance.post('/app/appscoredetails/queryDetailById',null,{
+        const {code, data: {records}} = await this.instance.post('/app/appscoredetails/list', null, {
           params: {
-            id:this.params.shopId
+            shopId: this.params.shopId,
+            pages: 1000
           }
         })
-        if(code===0){
+        if (code === 0 && records) {
-
+          this.tableData1 = records?.filter(item => item.type === '1')
+          this.tableData2 = records?.filter(item => item.type === '0')
         }
       } catch (e) {
         console.error(e)

project/fengdu/AppOutSource/AppMarkRate/components/List.vue

@@ -58,7 +58,7 @@
       </ai-search-bar>
       <ai-search-bar class="search-bar">
         <template #left>
-          <el-button icon="iconfont iconDelete" @click="handleDelete" :disabled="!ids.length">删除</el-button>
+          <el-button icon="iconfont iconDelete" @click="handleDeleteBach" :disabled="!ids.length">删除</el-button>
         </template>
         <template #right>
           <ai-download :instance="instance" url="/app/appintegraluser/girdIntegralExport" :params="search" fileName="门店评价"
@@ -177,7 +177,25 @@ export default {
       })
     },
 
-    handleDelete(ids=this.ids.join(',')){
+    handleDeleteBach(){
+      this.$confirm('确定删除该数据？').then(async () => {
+        try {
+          const {code} = await this.instance.post('/app/appshopassess/delete',null,{
+            params:{
+              ids:this.ids.join(",")
+            }
+          })
+          if(code===0){
+            this.$message.success('删除成功')
+            this.getList()
+          }
+        }catch (e) {
+          console.error(e)
+        }
+      })
+    },
+
+    handleDelete(ids){
       this.$confirm('确定删除该数据？').then(async () => {
         try {
          const {code} = await this.instance.post('/app/appshopassess/delete',null,{

project/fengdu/AppOutSource/AppRateManage/components/RuleManage.vue

@@ -83,7 +83,7 @@
         </el-form-item>
         <el-form-item label="规则：">常规</el-form-item>
         <el-form-item label="分值：" prop="score">
-          <el-input-number v-model="form.score" size="small" placeholder="请输入分值"></el-input-number>
+          <el-input-number v-model="form.score" :precision="2" size="small" placeholder="请输入分值"></el-input-number>
         </el-form-item>
       </el-form>
     </ai-dialog>