Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/drill/plan/index.vue

@@ -175,7 +175,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训机构类型" prop="execOrgType">
+            <el-form-item label="演练机构类型" prop="execOrgType">
               <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()" style="width: 100%;">
                 <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>
@@ -185,7 +185,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="培训角色" prop="planRoleId">
+            <el-form-item label="演练角色" prop="planRoleId">
               <el-select v-model="form.planRoleId" placeholder="请选择" multiple style="width:100%">
                 <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -198,7 +198,7 @@
                                        placeholder="请选择培训机构"/>
                         </el-form-item>-->
 
-            <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
+            <el-form-item v-show="form.execOrgType" label="演练机构" prop="planExecOrgIdList">
               <org-tree-select
                 v-model="form.planExecOrgIdList"
                 :queryData="form.execOrgType"

src/views/core/drill/task/index.vue

@@ -72,7 +72,7 @@
           </el-table-column>
           <el-table-column label="指挥人" align="center" prop="hostName"/>
           <el-table-column label="演练地点" align="center" prop="drillSite"/>
-          <el-table-column label="培训状态" align="center" prop="status" >
+          <el-table-column label="演练状态" align="center" prop="status" >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.drill_task_status" :value="scope.row.status"/>
           </template>

src/views/core/materials/index.vue

@@ -19,8 +19,8 @@
           </el-form-item>
 
 
-          <el-form-item label="公开状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择公开状态" clearable>
+          <el-form-item label="发布状态" prop="isOpen">
+            <el-select v-model="queryParams.isOpen" placeholder="请选择发布状态" clearable>
               <el-option v-for="item in openOption" :key="item.value" :label="item.label"
                          :value="item.value"></el-option>
             </el-select>
@@ -102,8 +102,8 @@
           <el-table-column label="资料标题"   align="left" width="160" prop="title"/>
           <el-table-column label="资料类型"  align="center" width="120" prop="knowledgeName"/>
           <el-table-column label="资料附件"  width="200" align="left" prop="fileNames"/>
-          <el-table-column label="公开状态" align="center" prop="isOpen">
-            <template slot-scope="r">{{ r.row.isOpen == 0 ? '未公开' : '公开' }}</template>
+          <el-table-column label="发布状态" align="center" prop="isOpen">
+            <template slot-scope="r">{{ r.row.isOpen == 0 ? '未发布' : '发布' }}</template>
           </el-table-column>
           <el-table-column label="上传人" align="center" prop="createBy"/>
           <el-table-column label="上传时间" align="center" prop="createTime"/>
@@ -119,7 +119,7 @@
                 icon="el-icon-folder-opened"
                 @click="handleOpen(scope.row,1)"
                 v-hasPermi="['core:materials:edit']"
-              >公开
+              >发布
               </el-button>
               <!-- 取消公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于公开状态-->
               <el-button
@@ -129,7 +129,7 @@
                 icon="el-icon-folder"
                 @click="handleOpen(scope.row,0)"
                 v-hasPermi="['core:materials:edit']"
-              >取消公开
+              >取消发布
               </el-button>
               <!-- 编辑与删除按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button
@@ -287,10 +287,10 @@ export default {
       defaultKeys: [],
       knowledgeList: [],
       openOption: [{
-        label: "公开",
+        label: "发布",
         value: 1
       }, {
-        label: "未公开",
+        label: "取消发布",
         value: 0
       }],
     };
@@ -423,7 +423,7 @@ export default {
     },
 
     handleOpen(row, isOpen) {
-      const str = 1 === isOpen ? "公开" : "取消公开";
+      const str = 1 === isOpen ? "发布" : "取消发布";
       this.$confirm(`确认要${str}吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/resumption/plan/dialog.edit.vue

@@ -22,7 +22,7 @@
                   v-model="formData.planName"
                   :maxlength="50"
                   name="planName"
-                  placeholder="请输入"
+                  placeholder="请输入计划名称"
                   clearable
                 />
               </el-form-item>
@@ -153,13 +153,13 @@
                   controls-position="right"
                   @change="handleChange"
                   :min="1"
-                  :max="10"
+                  :max="9"
                 ></el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item prop="note" label="备注">
-            <el-input v-model="formData.note" :maxlength="255" clearable />
+            <el-input v-model="formData.note" :maxlength="255" clearable placeholder="请输入备注"/>
           </el-form-item>
         </el-form>
         <el-button @click="openSelect">新增履职内容</el-button>
@@ -428,7 +428,16 @@ export default {
       this.isShow = true;
     },
     removeRow(row) {
-      this.tableData = this.tableData.filter((item) => item !== row);
+      this.$modal
+        .confirm('是否确认删除？')
+        .then(function () {
+          
+        })
+        .then(() => {
+          this.tableData = this.tableData.filter((item) => item !== row);
+          this.$modal.msgSuccess("删除成功");
+        })
+      
       // this.tableData.splice(index, 1);
     },
     // 事件

src/views/resumption/plan/index.vue

@@ -78,7 +78,7 @@
               prop="planStatus"
               label="任务状态"
               v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
+              placeholder="请选择计划状态"
               clearable
             >
               <el-option
@@ -95,7 +95,7 @@
               v-model="queryParams.planName"
               :maxlength="50"
               name="planName"
-              placeholder="请输入"
+              placeholder="请输入计划名称"
               clearable
             />
           </el-form-item>