修改

src/views/task/list/components/addPatrol copy.vue

@@ -96,7 +96,7 @@
       <template v-slot:groups v-if="showgroups">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>组别：
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>小组：
           </div>
           <div class="xy-table-item-content">
             <div>

src/views/task/list/components/addPatrol.vue

@@ -122,7 +122,7 @@
       <template v-slot:groups v-if="showgroups">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>组别：
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>小组：
           </div>
           <div class="xy-table-item-content">
             <div>
@@ -241,6 +241,27 @@
         userdata:[],
         mapform: [],
         patrol_table:[
+          {
+            label:'问题描述',
+            prop:'ask_introduce',
+            width:180,
+            customFn:(row,scope)=>{
+              return(<el-input v-model={this.patrol_list[scope.$index].ask_introduce} type='textarea'
+              placeholder="请输入问题描述" clearable>
+                </el-input>)
+            }
+          },
+
+          {
+            label:'整改建议',
+            prop:'tips',
+            width:180,
+            customFn:(row,scope)=>{
+              return(<el-input v-model={this.patrol_list[scope.$index].tips} type='textarea'
+              placeholder="请输入整改建议" clearable>
+                </el-input>)
+            }
+          },
           {
             label:'问题类型',
             prop:'ask_id',
@@ -298,6 +319,27 @@
           //         </div>)
           //   }
           // },
+          {
+            label:'问题图片',
+            prop:'files',
+            minWidth:220,
+            customFn:(row,scope)=>{
+              let _this = this
+              return(<el-upload action={this.action} style={{'overflow-x':'scroll','overflow-y':'hidden'}} class='upload-demo' list-type="picture-card"
+              file-list={this.patrol_list[scope.$index].pictureList}
+              ref="pictureUpload" auto-upload={true} data={this.uploadOther}
+              props={
+                {
+                  "on-success": (response, file, fileList) => this.handlesuccess(response, file, fileList,scope.$index),
+                  ["on-preview"]: (file) => this.handlePictureCardPreview(file),
+                  ["on-remove"]: (file, fileList) => this.handleRemove(file, fileList,scope.$index),
+                }
+
+              }>
+              <i class="el-icon-plus"></i>
+              </el-upload>)
+            }
+          },
           {
             label:'建议整改科室',
             prop:'ask_department',
@@ -319,48 +361,9 @@
               </el-select>)
             }
           },
-          {
-            label:'问题描述',
-            prop:'ask_introduce',
-            width:180,
-            customFn:(row,scope)=>{
-              return(<el-input v-model={this.patrol_list[scope.$index].ask_introduce} type='text'
-              placeholder="请输入问题描述" clearable>
-                </el-input>)
-            }
-          },
-          {
-            label:'整改建议',
-            prop:'tips',
-            width:180,
-            customFn:(row,scope)=>{
-              return(<el-input v-model={this.patrol_list[scope.$index].tips} type='text'
-              placeholder="请输入整改建议" clearable>
-                </el-input>)
-            }
-          },
 
-          {
-            label:'问题图片',
-            prop:'files',
-            minWidth:180,
-            customFn:(row,scope)=>{
-              let _this = this
-              return(<el-upload action={this.action} style={{'overflow-x':'scroll','overflow-y':'hidden'}} class='upload-demo' list-type="picture-card"
-              file-list={this.patrol_list[scope.$index].pictureList}
-              ref="pictureUpload" auto-upload={true} data={this.uploadOther}
-              props={
-                {
-                  "on-success": (response, file, fileList) => this.handlesuccess(response, file, fileList,scope.$index),
-                  ["on-preview"]: (file) => this.handlePictureCardPreview(file),
-                  ["on-remove"]: (file, fileList) => this.handleRemove(file, fileList,scope.$index),
-                }
 
-              }>
+
-              <i class="el-icon-plus"></i>
-              </el-upload>)
-            }
-          }
         ],
         patrol_list:[{
           ask_id:'',

src/views/task/list/components/addUnit.vue

@@ -101,20 +101,7 @@
           </div>
         </div>
 
-        <div>
+
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>附件：
-            </div>
-            <div class="xy-table-item-content">
-              <el-upload :action="action" class='upload-demo' :file-list="pictureList" ref="pictureUpload"
-                style="width:400px" :auto-upload="true" :data="uploadOther" :on-success="handlesuccess"
-                :on-remove="handleRemove">
-                <el-button size="small" type="primary">点击上传</el-button>
-              </el-upload>
-            </div>
-          </div>
-        </div>
         <div v-if="is_what_unitType=='学习'">
           <div class="xy-table-item">
             <div class="xy-table-item-label" style="font-weight: bold;">
@@ -138,6 +125,20 @@
                 style="width:400px"></el-input>
             </div>
           </div>
+        </div>
+        <div>
+          <div class="xy-table-item">
+            <div class="xy-table-item-label">
+              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>附件：
+            </div>
+            <div class="xy-table-item-content">
+              <el-upload :action="action" class='upload-demo' :file-list="pictureList" ref="pictureUpload"
+                style="width:400px" :auto-upload="true" :data="uploadOther" :on-success="handlesuccess"
+                :on-remove="handleRemove">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </div>
+          </div>
         </div>
       </template>
 
@@ -145,16 +146,16 @@
         <div>
           <div class="xy-table-item">
             <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>参与对象：
+              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>{{type!='send'?'参与对象':'承办人员'}}：
             </div>
             <div class="xy-table-item-content" style="width:400px">
               <el-radio-group v-model="form.name7" @change='changeName7'>
                 <!-- <el-radio :label="1">人员</el-radio>
                 <el-radio :label="2" v-if='form.type!=4'>部门</el-radio>
-                <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>组别</el-radio> -->
+                <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>小组</el-radio> -->
+                <el-radio v-if="type!='send'" :label="3">小组</el-radio>
+                <el-radio :label="1" v-if="type!='send'">人员</el-radio>
                 <el-radio v-if="type!='send'" :label="2">部门</el-radio>
-                <el-radio :label="1">人员</el-radio>
-                <el-radio v-if="type!='send'" :label="3">组别</el-radio>
               </el-radio-group>
             </div>
           </div>
@@ -199,11 +200,11 @@
             </div>
             <div class="xy-table-item-content" style='min-width:100px'>
               <Button type='primary'
-                @click="mission_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增组别</Button>
+                @click="mission_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增小组</Button>
               <div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'>
                 <div>
                   <Button style="margin-right:10px" @click="mission_groups_list.splice(index,1)">删除</Button>
-                  <div>组别：{{item.name=mission_groups_name[index]}}</div>
+                  <div>小组：{{item.name=mission_groups_name[index]}}</div>
                   <!-- <el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
                     <el-radio :label="1">人员</el-radio>
                     <el-radio :label="2">部门</el-radio>
@@ -231,7 +232,7 @@
           </div>
         </div>
 
-        <div>
+        <div v-if="type=='add'||type=='editor'">
           <div class="xy-table-item">
             <div class="xy-table-item-label">
               <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>责任人(科室)：
@@ -463,7 +464,7 @@
           end_date: '',
 
           lefts: '',
-          name7: 2,
+          name7: 3,
           audit_status: 4,
           unitTypeList: '',
           ask: [],
@@ -818,7 +819,7 @@
 
           lefts: '',
           name7: res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : (res
-            .groups.length > 0 ? 3 : 2)),
+            .groups.length > 0 ? 3 : 3)),
           audit_status: res.audit_status === 0 ? 0 : res.audit_status,
           unitTypeList: '',
           ask: res.ask ? res.ask : [],
@@ -992,7 +993,7 @@
           if (this.mission_groups_list.length == 0) {
             Message({
               type: 'warning',
-              message: `请新增组别`
+              message: `请新增小组`
             })
             return
           }
@@ -1166,22 +1167,22 @@
         if (newVal) {
           switch(this.type){
             case 'add':
-                this.typeName = '发起任务'
+                this.typeName = '发布任务'
                 break;
             case 'editor':
                 this.typeName = '编辑任务'
                 this.getDetail()
                 break;
             case 'send':
-                this.typeName = '分发任务'
+                this.typeName = '任务转办'
                 this.getDetail()
                 break;
             case 'pid':
-                this.typeName = '创建子任务'
+                this.typeName = '任务分解'
                 this.getDetail()
                 break;
             default:
-                this.typeName = '发起任务'
+                this.typeName = '发布任务'
                 break;
           }
 

src/views/task/list/components/checkUnit.vue

@@ -79,7 +79,8 @@
               </template>
               {{showform.end_content?showform.end_content:''}}
             </el-descriptions-item> -->
-              <el-descriptions-item span='4' >
+
+              <!-- <el-descriptions-item span='4' >
                 <template slot="label">
                   <span v-if="url_type!=5">参与对象</span>
                   <span v-else>操作</span>
@@ -126,7 +127,7 @@
                     </div>
                   </div>
                 </div>
-              </el-descriptions-item>
+              </el-descriptions-item> -->
               <el-descriptions-item span='4' v-if="is_what_unitType==='答题'">
                 <template slot="label">
                   答题正确数
@@ -174,7 +175,7 @@
           <div v-if="type=='show'">
             <!-- <el-divider>执行情况</el-divider> -->
             <el-tabs v-model="activeName">
-                <el-tab-pane label="子任务" name="first">
+                <el-tab-pane label="子任务" name="first" v-if="showform.pid_details && showform.pid_details.length>0">
                   <xy-table :list="showform.pid_details" stripe :table-item="pidTable"
                     :isPage='false'>
                     <template v-slot:btns>
@@ -403,7 +404,7 @@
     data() {
       return {
         isShow: false,
-        activeName:'first',
+        activeName:'second',
         type: '',
         id: '',
         login_id: "",
@@ -727,7 +728,7 @@
             align: 'center',
             width: 120
           },{
-                label: "组别",
+                label: "小组",
                 prop: '_names',
                 width: 240,
                 customFn: (row) => {
@@ -741,7 +742,7 @@
                         row._names.map(item => {
                             return ( <div> {
                                 item.group_name ?
-                                // 组别
+                                // 小组
                                 <div style = {
                                   {
                                     "display": "flex"
@@ -1046,7 +1047,7 @@
                           })
                           for (var k of res.data) {
                             var _names = []
-                            // 组别
+                            // 小组
                             if (this.showform.groups && this.showform.groups.length > 0) {
                               for (var g of this.showform.groups) {
                                 if (g.type == 1) {

src/views/task/list/components/showPatrol copy.vue

@@ -58,7 +58,7 @@
               </el-descriptions-item>
               <el-descriptions-item span='4' v-if="showgroups">
                 <template slot="label">
-                  组别
+                  小组
                 </template>
                 <div>
                   {{groupObj.name}}

src/views/task/list/components/showPatrol.vue

@@ -58,7 +58,7 @@
               </el-descriptions-item>
               <el-descriptions-item span='4' v-if="showgroups">
                 <template slot="label">
-                  组别
+                  小组
                 </template>
                 <div>
                   {{groupObj.name}}

src/views/task/list/components/showPlan.vue

@@ -244,7 +244,7 @@
                   return(<div>
                     {
                       item.group_name?
-                      // 组别
+                      // 小组
                       <div style={{"display": "flex"}}><div>{item.group_name}：</div>
                         <div style={{"display": "flex","flex-wrap": "wrap"}}>{
                           item.details.map(detail=>{
@@ -332,7 +332,7 @@
             })
             r._names = _names
           }
-          // 组别
+          // 小组
           if(r.groups&&r.groups.length>0){
               for(var g of r.groups){
                 for(var de of g.details){

src/views/task/list/js/index.js

@@ -29,7 +29,7 @@ export function getChangeUser() {
 
 /**
  * @param {Object} arr
- * 处理组别返回
+ * 处理小组返回
  */
 export function contactGroup(arr) {
   let tempArr = [],

src/views/task/list/planunit.vue

@@ -324,7 +324,7 @@
                   return(<div>
                     {
                       item.admin_details?
-                      // 组别
+                      // 小组
                       <div style={{"display": "flex"}}><div>{item.name}：</div>
                         <div  style={{"display": "flex","flex-wrap": "wrap"}}>{
                           item.admin_details.length>0?
@@ -573,7 +573,7 @@
                 })
                 r._names = _names
               }
-              // 组别
+              // 小组
               if(r.groups&&r.groups.length>0){
                 let ab = contactGroup(r.groups)
                 // ab.map(item=>{

src/views/task/list/unit.vue

@@ -108,29 +108,25 @@
                           @click="openMyMission(item.value,scope.row)">执行任务</Button>
                       </div>
                   </div>
-                   <!-- 组别的带头人 和小组组长 -->
+                   <!-- 小组的带头人 和小组组长 -->
                   <div v-else-if="(scope.row.groups && scope.row.groups.length>0 && !(scope.row.audit_status==3||scope.row.audit_status==5))
                   || scope.row.main_admin_id==stateObj.login_id">
+                    <!-- 组长权限 -->
                     <div v-for="item in scope.row.grounp_admin_detail">
-                      <div v-if="item.admin.id===stateObj.login_id || stateObj.is_manger">
+                      <div v-if="item.admin.id===stateObj.login_id">
                         <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
                           @click="editorUnit(scope.row.id,'send')">派发任务</Button>
                         <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
                           @click="editorUnit(scope.row.id,'pid')">创建任务</Button>
-                          <div v-for="item in unitTypeList">
+
-                            <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                              style="margin-right:5px;margin-bottom:5px;"
-                              @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                          </div>
-                      </div>
-                      <div v-else>
-                        <div v-for="item in unitTypeList">
-                          <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                            style="margin-right:5px;margin-bottom:5px;"
-                            @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                        </div>
                       </div>
                     </div>
+                    <!-- 组里面所有人都能执行任务 -->
+                    <div v-for="item in unitTypeList">
+                      <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                        style="margin-right:5px;margin-bottom:5px;"
+                        @click="openMyMission(item.value,scope.row)">执行任务</Button>
+                    </div>
 
                   </div>
                   <!-- 直接 执行任务 -->