修改负责人必填

src/config/setting.js

@@ -4,7 +4,7 @@
 export default {
     version: '1.0',
     name: 'JNDZ考核管理系统',  // 项目名称
-    baseURL: 'http://121.40.249.52:9031/api/',  // 接口地址
+    baseURL: 'http://47.98.157.120:9031/api/',  // 接口地址
     // baseURL: 'http://47.98.157.120:9031/api/',  // 接口地址
     // baseURL: 'http://127.0.0.1:9031/api/',  // 接口地址
     whiteList: ['/login', '/forget'],  // 路由白名单(不需要登录的)

src/views/basicTable/category.vue

@@ -146,6 +146,8 @@
             type="textarea"
             :rows="4"
             v-model="form.note"
+            :maxlength="50"
+            :show-word-limit="true"
           ></el-input>
         </el-form-item>
       </el-form>

src/views/chain/assessmentContent.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="body" :style="{ height: tableHeight + 'px' }" ref="body">
           <div v-for="(data, index) of dataList" :key="index">
-            <template v-if="data.children.length>0">
+            <template v-if="isEmpty(data)">
               <div class="type title">{{ index + 1 }}、{{ data.name }}</div>
               <div v-for="(item, ind) of data.children" :key="ind">
                 <template v-if="item.children.length > 0">
@@ -275,6 +275,16 @@ export default {
     this.getList();
   },
   methods: {
+    isEmpty(data) {
+      for (let item of data.children) {
+        for (let content of item.children) {
+          if(content.children.length==0){
+            return false 
+          }
+        }
+      }
+      return true;
+    },
     updateParams(data) {
       this.searchParams = data;
       this.getList();

src/views/chain/coordinationManage/applyCooperation.vue

@@ -117,6 +117,8 @@
               placeholder="请输入申请理由"
               :rows="5"
               v-model="form.note"
+              :maxlength="50"
+              :show-word-limit="true"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -183,7 +185,7 @@ export default {
           ? row.leaderDept.split(",").map((item) => parseInt(item))
           : []
       );
-      let bool = arr.includes(this.user.user.deptId)
+      let bool = arr.includes(this.user.user.deptId);
       return bool;
     },
     getDataList() {
@@ -213,9 +215,9 @@ export default {
             });
           });
           // console.log(list);
-          list = list.filter(item=>{
-            return !this.judge(item)
-          })
+          list = list.filter((item) => {
+            return !this.judge(item);
+          });
           this.dataList = this.reduceData(list);
         })
         .catch((e) => {
@@ -230,8 +232,8 @@ export default {
       this.form.chainIndustryId = row.id;
       this.form.isApply = 2;
     },
-    save(){
-      if(this.form.note) {
+    save() {
+      if (this.form.note) {
         applyApi
           .applyCooperate(Object.assign({}, this.form))
           .then((res) => {

src/views/chain/industryClassify.vue

@@ -13,7 +13,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-button type="primary" size="small" @click="search">查询</el-button>
+          <el-button type="primary" size="small" @click="search"
+            >查询</el-button
+          >
           <el-button
             type="default"
             size="small"
@@ -105,7 +107,7 @@
         @current-change="getDataList()"
       />
     </el-card>
-   <el-dialog
+    <el-dialog
       :title="dialogTitle"
       :visible.sync="showAdd"
       width="400px"
@@ -125,19 +127,28 @@
       >
         <el-form-item label="分类名称:" prop="name">
           <el-input
-          :disabled='ischecked=="look"'
+            :disabled="ischecked == 'look'"
             placeholder="请输入如分类名称"
             clearable
             v-model="form.name"
           ></el-input>
         </el-form-item>
         <el-form-item label="备注:">
-          <el-input :disabled='ischecked=="look"' type="textarea" :rows="4" v-model="form.note"></el-input>
+          <el-input
+            :disabled="ischecked == 'look'"
+            type="textarea"
+            :rows="4"
+            v-model="form.note"
+            :maxlength="50"
+            :show-word-limit="true"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="showAdd = false">取消</el-button>&nbsp;
-        <el-button type="primary" @click="save" v-if="ischecked !== 'look'">保存</el-button>
+        <el-button type="primary" @click="save" v-if="ischecked !== 'look'"
+          >保存</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -159,8 +170,8 @@ export default {
       startList: [],
       dataList: [],
       count: 0,
-       dialogTitle:'添加表',
-      ischecked: 'edit',
+      dialogTitle: "添加表",
+      ischecked: "edit",
       page: {
         page: 1,
         limit: Math.floor(
@@ -185,15 +196,15 @@ export default {
   },
   created() {
     api
-      .getList(Object.assign({},this.searchParams,this.page))
+      .getList(Object.assign({}, this.searchParams, this.page))
       .then((res) => {
         let data = res.data.data.records;
         this.startList = data;
       })
       .catch(() => {
         this.startList = [];
-      })
-    this.getDataList()
+      });
+    this.getDataList();
   },
   computed: {
     ...mapGetters(["formatDep"]),
@@ -220,7 +231,7 @@ export default {
     getDataList() {
       this.loading = true;
       api
-        .getList(Object.assign({},this.searchParams,this.page))
+        .getList(Object.assign({}, this.searchParams, this.page))
         .then((res) => {
           this.loading = false;
           let data = res.data.data.records;
@@ -234,16 +245,16 @@ export default {
         });
     },
     add() {
-      this.dialogTitle = '添加表'
+      this.dialogTitle = "添加表";
       this.form = { code: "", name: "", note: "", year: "" };
       this.showAdd = true;
-      this.ischecked = 'add'
+      this.ischecked = "add";
     },
     edit(row) {
-      this.form = Object.assign({}, row)
+      this.form = Object.assign({}, row);
       this.showAdd = true;
-      this.dialogTitle = '编辑表'
-      this.ischecked = 'edit'
+      this.dialogTitle = "编辑表";
+      this.ischecked = "edit";
     },
     remove(row) {
       if (!row) {
@@ -265,7 +276,8 @@ export default {
                 this.loading = fa;
                 se;
                 this.$message.error("删失败");
-              }).finally(()=>{
+              })
+              .finally(() => {
                 this.getDataList();
               });
           })
@@ -282,7 +294,8 @@ export default {
           .catch(() => {
             this.loading = false;
             this.$message.error("删除失败");
-          }).finally(()=>{
+          })
+          .finally(() => {
             this.getDataList();
           });
       }

src/views/second/coordinationManage/applyCooperation/basicTarget.vue

@@ -132,6 +132,8 @@
             placeholder="请输入申请理由"
             :rows="5"
             v-model="form.note"
+            :maxlength="50"
+            :show-word-limit="true"
           ></el-input>
         </el-form-item>
       </el-form>

src/views/second/coordinationManage/applyCooperation/constraint.vue

@@ -126,6 +126,8 @@
             type="textarea"
             placeholder="请输入申请理由"
             :rows="5"
+            :maxlength="50"
+            :show-word-limit="true"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -186,7 +188,7 @@ export default {
           ? row.leaderDept.split(",").map((item) => parseInt(item))
           : []
       );
-      let bool = arr.includes(this.user.user.deptId)
+      let bool = arr.includes(this.user.user.deptId);
       return bool;
     },
     updateParams(data) {
@@ -210,9 +212,9 @@ export default {
         .then((res) => {
           let data = res.data.data;
           this.count = data.total;
-          data = data.records.filter(item=>{
-            return !this.judge(item)
-          })
+          data = data.records.filter((item) => {
+            return !this.judge(item);
+          });
           this.dataList = this.reduceData(data);
         })
         .catch((e) => {
@@ -231,7 +233,7 @@ export default {
       this.form.isApply = 1;
     },
     save() {
-     if(this.form.note) {
+      if (this.form.note) {
         applyApi
           .applyCooperate(Object.assign({}, this.form))
           .then((res) => {

src/views/second/coordinationManage/applyCooperation/reward.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="reward" v-loading="loading">
-    <search :type="2" @search:task="updateParams($event)"/>
+    <search :type="2" @search:task="updateParams($event)" />
     <el-table
       :data="dataList"
       border
@@ -132,6 +132,8 @@
             type="textarea"
             placeholder="请输入申请理由"
             :rows="5"
+            :maxlength="50"
+            :show-word-limit="true"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -193,7 +195,7 @@ export default {
           ? row.leaderDept.split(",").map((item) => parseInt(item))
           : []
       );
-      let bool = arr.includes(this.user.user.deptId)
+      let bool = arr.includes(this.user.user.deptId);
       return bool;
     },
     updateParams(data) {
@@ -217,9 +219,9 @@ export default {
         .then((res) => {
           let data = res.data.data;
           this.count = data.total;
-          data = data.records.filter(item=>{
-            return !this.judge(item)
-          })
+          data = data.records.filter((item) => {
+            return !this.judge(item);
+          });
           this.dataList = this.reduceData(data);
         })
         .catch((e) => {
@@ -239,7 +241,7 @@ export default {
       // this.form.isApply = 1
     },
     save() {
-      if(this.form.note) {
+      if (this.form.note) {
         applyApi
           .applyCooperate(Object.assign({}, this.form))
           .then((res) => {

src/views/system/dept/index.vue

@@ -66,9 +66,7 @@
             <el-radio :label="2">被考核部门</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="主负责人" prop="principal" :rules="{
-                required: true, message: '主负责人不能为空', trigger: 'change'
-              }">
+        <el-form-item label="主负责人" prop="principal">
           <el-select filterable clearable v-model="form.principal" size="small" placeholder="-请选择主负责人-" class="ele-block">
             <el-option v-for="item in userList" :key="item.id" :label="item.realname" :value="item.id"/>
           </el-select>