Merge branch 'feature' into dev

src/views/modules/communityService/gxxq/index.vue

@@ -152,7 +152,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            {{ scope.row.assignFlag == "0" ? "未指派" : "已指派" }}
+            {{ scope.row.assignFlag == "0" ? "未指派" : (scope.row.assignFlag == "1" ? "已指派" : "已完成") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -166,7 +166,7 @@
             <el-button @click="handleEdit(scope.row)" size="small" type="text"
               >查看</el-button
             >
-            <el-button
+            <el-button v-if="scope.row.assignFlag != 2"
               style="margin-right: 10px"
               @click="handleAdd(scope.row, 'edit')"
               size="small"
@@ -178,7 +178,7 @@
                 title="删除之后无法回复，确认删除？"
                 @onConfirm="handleDel(scope.row)"
               >
-                <el-button size="small" type="text" slot="reference"
+                <el-button size="small" type="text" slot="reference" v-if="scope.row.assignFlag != 2"
                   >删除</el-button
                 >
               </el-popconfirm>
@@ -293,17 +293,17 @@ export default {
       },
       statusArray: [
         {
-          value: 2,
-          label: "待处理",
+          value: 0,
+          label: "未指派",
         },
         {
           value: 1,
-          label: "已派单",
+          label: "已指派",
         },
         {
-          value: 0,
+          value: 2,
           label: "已完成",
-        },
+        }
       ],
       endPickerOptions: {
         disabledDate: endDisabledDate,