界面调整

src/views/check/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
-      :title="id ? '编辑检查计划' : '新增检查计划'"
+      :title="id ? '编辑检查任务' : '新增检查任务'"
       :visible.sync="isShow"
       width="1500px"
     >
@@ -17,7 +17,7 @@
         >
           <el-row>
             <el-col :span="6">
-              <el-form-item prop="planName" label="计划名称:">
+              <el-form-item prop="planName" label="任务名称:">
                 <el-input
                   v-model.trim="formData.planName"
                   :maxlength="50"
@@ -28,12 +28,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="checkType" label="检查类型:">
+              <el-form-item prop="checkType" label="任务类型:">
                 <el-select
                   :disabled="isChildren()"
-                  label="检查类型"
+                  label="任务类型"
                   v-model="formData.checkType"
-                  placeholder="请选择检查类型"
+                  placeholder="请选择任务类型"
                   clearable
                 >
                   <el-option
@@ -47,13 +47,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planCycle" label="检查周期:">
+              <el-form-item prop="planCycle" label="任务周期:">
                 <el-select
                   :disabled="isChildren()"
                   prop="planCycle"
-                  label="检查周期"
+                  label="任务周期"
                   v-model="formData.planCycle"
-                  placeholder="请选择检查周期"
+                  placeholder="请选择任务周期"
                   clearable
                 >
                   <el-option
@@ -119,14 +119,14 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item prop="execOrgType" label="检查机构类型:">
+              <el-form-item prop="execOrgType" label="检查主体类型:">
                 <el-select
                   :disabled="isChildren()"
                   @change="cleanExecOrgList"
                   prop="execOrgType"
-                  label="检查机构类型"
+                  label="机构类型"
                   v-model="formData.execOrgType"
-                  placeholder="请选择检查机构类型"
+                  placeholder="请选择机构类型"
                   clearable
                 >
                   <el-option
@@ -142,12 +142,12 @@
             <!-- </el-row> -->
             <!-- <el-row> -->
             <el-col :span="6">
-              <el-form-item prop="roleIds" label="检查角色:">
+              <el-form-item prop="roleIds" label="检查人员:">
                 <el-select
                   :disabled="isChildren()"
-                  label="检查角色"
+                  label="检查人员"
                   v-model="formData.roleIds"
-                  placeholder="请选择检查角色"
+                  placeholder="请选择用户角色"
                   multiple
                   filterable
                   @change="handleRolesChange"
@@ -170,7 +170,7 @@
                   prop="checkOrgType"
                   label="受检机构类型"
                   v-model="formData.checkOrgType"
-                  placeholder="请选择受检机构类型"
+                  placeholder="请选择机构类型"
                   clearable
                 >
                   <el-option
@@ -184,7 +184,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="count" label="检查次数:">
+              <el-form-item prop="count" label="任务次数:">
                 <el-input-number
                   style="margin-left: 10px"
                   v-model="formData.count"
@@ -198,7 +198,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item :span="6" prop="execOrgIds" label="检查机构">
+              <el-form-item :span="6" prop="execOrgIds" label="检查主体">
                 <org-tree-select
                   :disabled="isChildren()"
                   v-model="formData.execOrgIds"
@@ -256,7 +256,7 @@
             />
           </el-form-item>
         </el-form>
-        <el-button @click="openSelect">新增检查内容</el-button>
+        <el-button @click="openSelect">选择检查内容</el-button>
         <el-button @click="deleteSelected">批量删除</el-button>
         <el-table
           :data="tableData"
@@ -290,7 +290,7 @@
           </el-table-column>
           <el-table-column
             prop="ruleName"
-            label="
+            label="检查内容库
           "
           >
           </el-table-column>
@@ -303,7 +303,7 @@
           <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
           </el-table-column>
           <el-table-column prop="areaName" label="检查区域"> </el-table-column>
-          <el-table-column prop="businessType" label="数据来源">
+          <el-table-column prop="businessType" label="数据来源" v-if="false">
             <template slot-scope="r">
               {{
                 getLabel(dict.type.point_data_source, `${r.row.businessType}`)

src/views/check/index.vue

@@ -21,9 +21,25 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="100px"
+          label-width="70px"
         >
-          <el-form-item prop="execOrgType" label="检查机构类型">
+        <el-form-item prop="checkType" label="任务类型" >
+            <el-select
+              prop="checkType"
+              label="任务类型"
+              v-model="queryParams.checkType"
+              placeholder="请选择任务类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.check_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
             <el-select
               prop="execOrgType"
               label="检查机构类型"
@@ -39,7 +55,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="checkOrgType" label="受检机构类型">
+          <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
             <el-select
               prop="checkOrgType"
               label="受检机构类型"
@@ -56,13 +72,13 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item prop="checkRole" label="检查角色">
+          <el-form-item prop="checkRole" label="检查人员">
             <el-select
               @visible-change="getRolesByOrg"
               prop="checkRole"
-              label="检查角色"
+              label="检查人员"
               v-model="queryParams.checkRole"
-              placeholder="请选择检查角色"
+              placeholder="请选择用户角色"
               clearable
             >
               <el-option
@@ -73,12 +89,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="planCycle" label="检查周期">
+          <el-form-item prop="planCycle" label="任务周期">
             <el-select
               prop="planCycle"
-              label="检查周期"
+              label="任务周期"
               v-model="queryParams.planCycle"
-              placeholder="请选择检查周期"
+              placeholder="请选择任务周期"
               clearable
             >
               <el-option
@@ -90,21 +106,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="planName" label="计划名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态">
+          <el-form-item prop="planStatus" label="任务状态">
             <el-select
               prop="planStatus"
-              label="计划状态"
+              label="任务状态"
               v-model="queryParams.planStatus"
-              placeholder="请选择计划状态"
+              placeholder="请选择任务状态"
               clearable
             >
               <el-option
@@ -116,6 +123,16 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item prop="planName" label="任务名称">
+            <el-input
+              v-model="queryParams.planName"
+              :maxlength="50"
+              name="planName"
+              placeholder="请输入关键字"
+              clearable
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button
               type="primary"
@@ -126,6 +143,13 @@
             >
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
               >重置</el-button
+            ><el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd()"
+              v-hasPermi="['core:checkplan:add']"
+              >新增任务</el-button
             >
           </el-form-item>
         </el-form>
@@ -133,14 +157,7 @@
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['core:checkplan:add']"
-              >新增计划</el-button
-            >
+            
           </el-col>
           <right-toolbar
             :showSearch.sync="showSearch"

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

@@ -2,7 +2,7 @@
   <div class="rule-type">
     <DialogCom
       @colse="onHide"
-      :title="id ? '编辑履职计划' : '新增履职计划'"
+      :title="id ? '编辑履职任务' : '新增履职任务'"
       :visible.sync="isShow"
       width="1500px"
     >
@@ -18,24 +18,24 @@
         >
           <el-row>
             <el-col :span="6">
-              <el-form-item prop="planName" label="计划名称:">
+              <el-form-item prop="planName" label="任务名称:">
                 <el-input :disabled="isChildren()"
                   v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
-                  placeholder="请输入计划名称"
+                  placeholder="请输入任务名称"
                   clearable
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planType" label="计划类型:">
+              <el-form-item prop="planType" label="任务类型:">
                 <el-select
                   :disabled="isChildren()"
                   @change="changeData"
-                  label="计划类型"
+                  label="任务类型"
                   v-model="formData.planType"
-                  placeholder="请选择计划类型"
+                  placeholder="请选择任务类型"
                   clearable
                 >
                   <el-option
@@ -50,14 +50,14 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item prop="planCycle" label="履职周期:">
+              <el-form-item prop="planCycle" label="任务周期:">
                 <el-select
                   @change="changeBuildTime"
                   :disabled="isChildren()"
                   prop="planCycle"
-                  label="履职周期"
+                  label="任务周期"
                   v-model="formData.planCycle"
-                  placeholder="请选择履职周期"
+                  placeholder="请选择任务周期"
                   clearable
                 >
                   <el-option
@@ -75,6 +75,25 @@
                 </el-form-item>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item prop="planExec" label="任务时间:">
+                <el-select
+                  :disabled="isChildren()"
+                  label="任务时间"
+                  v-model="formData.planExec"
+                  placeholder="请选择任务时间"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.resumption_plan_exec"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <!-- <el-col :span="6">
               <el-form-item prop="planStatus" label="计划状态:"> -->
             <!-- <el-select
@@ -100,27 +119,16 @@
                 ></el-switch> -->
             <!-- </el-form-item> -->
             <!-- </el-col> -->
-            <el-col :span="6" v-if="id ? false : true">
-              <el-form-item prop="tempBuildTaskNow" label="立即生效:">
-                <div class="checkbox-wrapper">
-                  <el-checkbox
-                    v-model="tempBuildTaskNow"
-                    size="medium"
-                    @change="handleCheckboxChange"
-                    >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
-                  >
-                </div>
-              </el-form-item>
-            </el-col>
+            
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item prop="execOrgType" label="履职机构类型:">
+              <el-form-item prop="execOrgType" label="机构类型:">
                 <el-select
                   :disabled="isChildren()"
-                  label="履职机构类型"
+                  label="机构类型"
                   v-model="formData.execOrgType"
-                  placeholder="请选择履职机构类型"
+                  placeholder="请选择机构类型"
                   @change="onOrgTypeChanged"
                   clearable
                 >
@@ -135,12 +143,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="roleList" label="履职角色:">
+              <el-form-item prop="roleList" label="履职人员:">
                 <el-select
                   :disabled="isChildren()"
-                  label="履职角色"
+                  label="履职人员"
                   v-model="formData.roleList"
-                  placeholder="请选择履职角色"
+                  placeholder="请选择用户角色"
                   multiple
                   filterable
                   @change="handleRolesChange"
@@ -155,28 +163,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item prop="planExec" label="履职时间:">
-                <el-select
-                  :disabled="isChildren()"
-                  label="履职时间"
-                  v-model="formData.planExec"
-                  placeholder="请选择履职时间"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.resumption_plan_exec"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+            
 
             <el-col :span="6">
-              <el-form-item prop="count" label="履职次数:" >
+              <el-form-item prop="count" label="任务次数:" >
                 <el-input-number
                   style="margin-left: 10px"
                   v-model="formData.count"
@@ -187,6 +177,18 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
+            <el-col :span="6" >
+              <el-form-item prop="tempBuildTaskNow" label="立即生效:">
+                <div class="checkbox-wrapper">
+                  <el-checkbox :disabled="isChildren()"
+                    v-model="tempBuildTaskNow"
+                    size="medium"
+                    @change="handleCheckboxChange"
+                    >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
+                  >
+                </div>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-form-item prop="note" label="备注">
             <el-input
@@ -198,7 +200,7 @@
             />
           </el-form-item>
         </el-form>
-        <el-button @click="openSelect">新增履职内容</el-button>
+        <el-button @click="openSelect">选择履职内容</el-button>
         <el-button @click="deleteSelected">批量删除</el-button>
         <el-table
           :data="tableData"
@@ -242,7 +244,7 @@
           <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
           </el-table-column>
           <el-table-column prop="areaName" label="履职区域"> </el-table-column>
-          <el-table-column prop="checkName" label="履职点位"> </el-table-column>
+          <el-table-column prop="checkName" label="履职点位" v-if="false"> </el-table-column>
           <el-table-column label="操作">
             <template v-slot="{ row }">
               <el-button
@@ -694,6 +696,7 @@ export default {
       // console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
+          this.tempBuildTaskNow=res.data.buildTaskNow>0?true:false;
           this.parentCount = res.data.parentCount;
           // console.log(res, "res");
           this.tableData = res.data.itemList;

src/views/resumption/plan/index.vue

@@ -21,14 +21,14 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="100px"
+          label-width="70px"
         >
-          <el-form-item prop="planType" label="计划类型">
+          <el-form-item prop="planType" label="任务类型">
             <el-select
               prop="planType"
-              label="计划类型"
+              label="任务类型"
               v-model="queryParams.planType"
-              placeholder="请选择计划类型"
+              placeholder="请选择任务类型"
               clearable
             >
               <el-option
@@ -39,13 +39,13 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="resumptionRole" label="履职角色">
+          <el-form-item prop="resumptionRole" label="履职人员">
             <el-select
               @visible-change="getRolesByOrg"
               prop="resumptionRole"
-              label="履职角色"
+              label="履职人员"
               v-model="queryParams.resumptionRole"
-              placeholder="请选择履职角色"
+              placeholder="请选择用户角色"
               clearable
             >
               <el-option
@@ -57,12 +57,12 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item prop="planCycle" label="履职周期">
+          <el-form-item prop="planCycle" label="任务周期">
             <el-select
               prop="planCycle"
-              label="履职周期"
+              label="任务周期"
               v-model="queryParams.planCycle"
-              placeholder="请选择履职周期"
+              placeholder="请选择任务周期"
               clearable
             >
               <el-option
@@ -74,12 +74,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态">
+          <el-form-item prop="planStatus" label="任务状态">
             <el-select
               prop="planStatus"
               label="任务状态"
               v-model="queryParams.planStatus"
-              placeholder="请选择计划状态"
+              placeholder="请选择任务状态"
               clearable
             >
               <el-option
@@ -92,12 +92,12 @@
             </el-select>
             <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
           </el-form-item>
-          <el-form-item prop="planName" label="计划名称">
+          <el-form-item prop="planName" label="任务名称">
             <el-input
               v-model="queryParams.planName"
               :maxlength="50"
               name="planName"
-              placeholder="请输入计划名称"
+              placeholder="请输入任务名称"
               clearable
             />
           </el-form-item>
@@ -112,52 +112,27 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
               >重置</el-button
             >
-          </el-form-item>
-        </el-form>
-
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
               v-hasPermi="['system:user:add']"
-              >新增</el-button
-            >
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
+              >新增任务</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            >
-          </el-col>-->
+          </el-form-item>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5"> </el-col>
 
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+            <right-toolbar
+              :showSearch.sync="showSearch"
+              @queryTable="getList"
+              :columns="columns"
+            ></right-toolbar>
+          </el-row>
+        </el-form>
+
+        <!--    按纽    -->
 
         <el-table
           border
@@ -177,12 +152,12 @@
           ></el-table-column>
           <el-table-column
             prop="planName"
-            label="计划名称"
+            label="任务名称"
             v-if="columns[1].visible"
           ></el-table-column>
           <el-table-column
             prop="planType"
-            label="计划类型"
+            label="任务类型"
             width="120"
             v-if="columns[2].visible"
           >
@@ -194,7 +169,7 @@
           </el-table-column>
           <el-table-column
             prop="planCreateOrgName"
-            label="计划创建机构"
+            label="创建机构"
             width="120"
             v-if="columns[3].visible"
           >
@@ -204,14 +179,14 @@
           </el-table-column>
           <el-table-column
             prop="planOfOrgName"
-            label="计划所属机构"
+            label="行社名称"
             width="120"
             v-if="columns[4].visible"
           ></el-table-column>
 
           <el-table-column
             prop="execOrgType"
-            label="履职机构类型"
+            label="机构类型"
             width="100px"
             v-if="columns[5].visible"
           >
@@ -222,12 +197,12 @@
 
           <el-table-column
             prop="roleNames"
-            label="履职角色"
+            label="履职人员"
             v-if="columns[6].visible"
           ></el-table-column>
           <el-table-column
             prop="planCycle"
-            label="履职周期"
+            label="任务周期"
             width="80px"
             v-if="columns[7].visible"
           >
@@ -238,15 +213,9 @@
             </template>
           </el-table-column>
 
-          <!-- <el-table-column
-            prop="count"
-            label="履职次数"
-            v-if="columns[7].visible"
-          ></el-table-column> -->
-
           <el-table-column
             prop="planExec"
-            label="履职时间"
+            label="任务时间"
             width="80px"
             v-if="columns[8].visible"
           >
@@ -256,17 +225,14 @@
               }}
             </template>
           </el-table-column>
-
           <el-table-column
-            prop="updateName"
-            label="修改人"
-            width="100px"
-            v-if="columns[9].visible"
+            prop="count"
+            label="任务次数"
+            v-if="columns[7].visible"
           ></el-table-column>
-
           <el-table-column
             prop="planStatus"
-            label="计划状态"
+            label="任务状态"
             width="80px"
             v-if="columns[10].visible"
           >
@@ -279,6 +245,12 @@
               }}
             </template>
           </el-table-column>
+          <el-table-column
+            prop="updateName"
+            label="修改人"
+            width="100px"
+            v-if="false"
+          ></el-table-column>
 
           <el-table-column fixed="right" width="120" label="操作">
             <template slot-scope="r">
@@ -301,7 +273,10 @@
                 v-hasPermi="['system:user:remove']"
                 >删除</el-button
               >
-              <el-divider direction="vertical"  v-if="eqOrg2(r.row)"></el-divider>
+              <el-divider
+                direction="vertical"
+                v-if="eqOrg2(r.row)"
+              ></el-divider>
               <el-button
                 size="mini"
                 type="text"
@@ -311,7 +286,10 @@
                 v-hasPermi="['system:user:remove']"
                 >下发</el-button
               >
-              <el-divider direction="vertical" v-if="checkCanPublish(r.row)"></el-divider>
+              <el-divider
+                direction="vertical"
+                v-if="checkCanPublish(r.row)"
+              ></el-divider>
               <el-button
                 size="mini"
                 type="text"
@@ -321,7 +299,10 @@
                 v-hasPermi="['system:user:remove']"
                 >下发</el-button
               >
-              <el-divider direction="vertical" v-if="newcheckCanPublish(r.row)"></el-divider>
+              <el-divider
+                direction="vertical"
+                v-if="newcheckCanPublish(r.row)"
+              ></el-divider>
               <el-button
                 size="mini"
                 type="text"
@@ -434,7 +415,12 @@ export default {
     eqOrg(row) {
       // console.log(row.planOfOrgId,"row.planOfOrgId");
       // console.log(this.orgId,"this.orgId");
-      if (row != null && row != undefined && (row.planCreateOrgId == this.orgId||(row.planOfOrgType==3&&row.planOfOrgId==this.orgId))) {
+      if (
+        row != null &&
+        row != undefined &&
+        (row.planCreateOrgId == this.orgId ||
+          (row.planOfOrgType == 3 && row.planOfOrgId == this.orgId))
+      ) {
         return true;
       }
       return false;
@@ -442,21 +428,25 @@ export default {
     eqOrg2(row) {
       // console.log(row.planCreateOrgId,"row.planCreateOrgId");
       // console.log(this.orgId,"this.orgId");
-      if (row != null && row != undefined && row.planCreateOrgId == this.orgId&& row.planOfOrgId == this.orgId) {
+      if (
+        row != null &&
+        row != undefined &&
+        row.planCreateOrgId == this.orgId &&
+        row.planOfOrgId == this.orgId
+      ) {
         return true;
       }
       return false;
     },
     //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
-
       // console.log(row.planStatus,"row.planStatus")
-      if ((row.planOfOrgType == "1" && row.distribute == 0)) {
+      if (row.planOfOrgType == "1" && row.distribute == 0) {
         return true;
       }
       return false;
     },
-    newcheckCanPublish(row){
+    newcheckCanPublish(row) {
       //如果计划所属机构类型为行社并且计划不为进行中并且计划创建机构为当前机构或者
       //计划状态为停用并且不属于子计划并且计划所属机构类型为省联社
       if (
@@ -489,7 +479,7 @@ export default {
     },
     //已下发的显示撤回
     chehui(row) {
-      if (row.distribute == 1&&row.planCreateOrgId == this.orgId) {
+      if (row.distribute == 1 && row.planCreateOrgId == this.orgId) {
         return true;
       }
       return false;
@@ -539,40 +529,34 @@ export default {
     onEdit(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
-    newshowDialogDistribute(row){
+    newshowDialogDistribute(row) {
       this.$modal
         .confirm("是否下发!", "提示")
         .then(() => {
           // 用户点击了确认按钮
           console.log("执行操作...");
           this.loading = true;
-      api
-        .distributeCheHui(row.id)
-        .then((response) => {
-          // console.log(response, "then");
-          if (response.data == 0) {
-            this.loading = false;
-          } else {
-            this.getList();
-            this.loading = false;
-          }
-        })
-        .catch((response) => {
-          // console.log(response, "catch");
-          this.getList();
-          this.loading = false;
-        });
+          api
+            .distributeCheHui(row.id)
+            .then((response) => {
+              // console.log(response, "then");
+              if (response.data == 0) {
+                this.loading = false;
+              } else {
+                this.getList();
+                this.loading = false;
+              }
+            })
+            .catch((response) => {
+              // console.log(response, "catch");
+              this.getList();
+              this.loading = false;
+            });
         })
         .catch(() => {
           // 用户点击了取消按钮
           console.log("取消操作...");
         });
-
-
-
-
-
-
     },
     showDialogDistribute(row) {
       // this.loading = true;
@@ -603,14 +587,16 @@ export default {
           // 用户点击了确认按钮
           console.log("执行操作...");
           this.loading = true;
-          api.delelte(id).then(() => {
-            this.getList();
-            this.loading = false;
-            this.$modal.msgSuccess("删除成功");
-            
-          }).catch(()=>{
-            this.loading = false;
-          });
+          api
+            .delelte(id)
+            .then(() => {
+              this.getList();
+              this.loading = false;
+              this.$modal.msgSuccess("删除成功");
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         })
         .catch(() => {
           // 用户点击了取消按钮

src/views/system/dept/extend.vue

@@ -295,7 +295,7 @@
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
-                  :max="9999"
+                  :max="999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -306,7 +306,7 @@
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
-                  :max="9999"
+                  :max="999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -361,7 +361,7 @@
                 label="业务库防控隔离门出入口数量"
                 label-width="150"
               >
-                <el-select
+                <!-- <el-select
                   clearable
                   v-model="remoteCount"
                   placeholder="请选择数量"
@@ -372,12 +372,19 @@
                     :label="option.label"
                     :value="option.value"
                   ></el-option>
-                </el-select>
+                </el-select> -->
+                <el-input-number
+                  v-model="remoteCount"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="999"
+                ></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="6" v-if="type == 10">
               <el-form-item label="离行式加钞间出入口数量" label-width="150">
-                <el-select
+                <!-- <el-select
                   clearable
                   v-model="cashAddingRoom"
                   placeholder="请选择数量"
@@ -388,7 +395,14 @@
                     :label="option.label"
                     :value="option.value"
                   ></el-option>
-                </el-select>
+                </el-select> -->
+                <el-input-number
+                  v-model="cashAddingRoom"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="999"
+                ></el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
@@ -418,7 +432,7 @@
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
-                  :max="9999"
+                  :max="999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -429,7 +443,7 @@
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
-                  :max="9999"
+                  :max="999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -462,7 +476,7 @@
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
-                :max="9999"
+                :max="999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -474,7 +488,7 @@
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
-                :max="9999"
+                :max="999"
               ></el-input-number>
             </el-form-item>
           </el-col>