Merge branch 'develop' into dev_kdl

src/components/selectList.vue

@@ -4,7 +4,7 @@
     <van-sticky offset-top="0">
       <div class="content-wrap">
         <div class="search-wrap">
-          <van-search v-model="searchVal" placeholder="搜索" @input="onInput"/>
+          <van-search v-model="searchVal" placeholder="搜索" @input="onInput" />
         </div>
       </div>
     </van-sticky>
@@ -16,12 +16,17 @@
                     finished-text="没有更多了"
                     @load="getInsideUser()"
                 > -->
-                <van-checkbox  style="margin: 0px 10px;" v-for="(item,index) in listdata" :name="item.dictLabel" :key="index" @click="selData(item)">
+        <van-checkbox
+          style="margin: 0px 10px;"
+          v-for="(item, index) in listdata"
+          :name="item.dictLabel"
+          :key="index"
+          @click="selData(item)"
+        >
           <van-cell :title="item.dictValue" />
         </van-checkbox>
         <!-- </van-list> -->
       </van-checkbox-group>
-
     </div>
     <!-- 底部信息 -->
     <footer class="footer">
@@ -35,8 +40,7 @@
             style="border-radius: 5px; background-color: #f0f1f5;"
             @click.native="cancel"
             >取消
-            </van-button
-            >
+          </van-button>
           <van-button
             size="small"
             type="info"
@@ -44,77 +48,73 @@
             style="margin:0 10px 0 20px;border-radius: 5px;"
             @click.native="save"
             >保存
-            </van-button
-            >
+          </van-button>
         </div>
       </van-cell-group>
     </footer>
   </div>
-  </template>
+</template>
 
-  <script>
+<script>
+import { debounce } from "@/utils/common.js";
 
-  import {debounce} from "@/utils/common.js";
-  
-  export default {
-    props:{
-      listdata:{
-        type:Array,
-        default:()=>[],
+export default {
+  props: {
+    listdata: {
+      type: Array,
+      default: () => []
     }
   },
   components: {
     // LHeader
   },
-    created() {
-    },
+  created() {},
   data() {
     return {
       text: "选择人员",
       personName: "",
       searchVal: "",
-        checkbox:[],
+      checkbox: [],
       pageSize: 20,
       pageNum: 1,
       loading: false,
       finished: false,
-        projectList:[],
-        itemSel:{
-
-        }
+      projectList: [],
+      itemSel: {}
     };
   },
   methods: {
     // 待搜索框内容发生变化
-      onInput: debounce(function () {
-        this.projectList=[]
-        this.pageNum=1
-        this.finished = false
-        this.loading = true
+    onInput: debounce(function() {
+      this.projectList = [];
+      this.pageNum = 1;
+      this.finished = false;
+      this.loading = true;
       this.getInsideUser();
     }, 800),
 
-      selData(e){
-        this.itemSel=e
+    selData(e) {
+      this.itemSel = e;
     },
     save() {
-        this.$emit('saveSlect', this.checkbox)
+      this.$emit("saveSlect", this.checkbox);
+      this.checkbox = [];
     },
     cancel() {
-        this.$emit('closeSlect')
+      this.$emit("closeSlect");
     }
   }
-  };
-  </script>
-  <style lang="less" scoped>
-  /* @import url(); 引入css类 */
-  // 搜索
-  .content-wrap {
+};
+</script>
+<style lang="less" scoped>
+/* @import url(); 引入css类 */
+// 搜索
+.content-wrap {
   padding: 10px;
   background-color: #f0f1f5;
-  }
+}
 
-  .search-wrap {
+.search-wrap {
   margin: 0.26667rem;
 
   .van-search {
@@ -125,9 +125,9 @@
   .van-search__content {
     background-color: #ffffff;
   }
-  }
+}
 
-  .upStep {
+.upStep {
   .van-cell-group {
     display: flex;
     height: 1.2rem;
@@ -163,22 +163,22 @@
       white-space: nowrap;
     }
   }
-  }
+}
 
-  .dept-list-wrap {
+.dept-list-wrap {
   margin-top: 0.266667rem;
-  }
+}
 
-  .people-wrap {
+.people-wrap {
   margin-top: 0.266667rem;
 
   /deep/ .van-radio__label {
     display: flex;
     align-items: center;
   }
-  }
+}
 
-  .footer {
+.footer {
   width: 100%;
   height: 1.4rem;
   z-index: 9;
@@ -218,6 +218,5 @@
       }
     }
   }
-  }
-  </style>
-  
+}
+</style>
\ No newline at end of file

src/main.js

@@ -8,16 +8,19 @@ import qs from 'qs';
 import './permission'
 import Cookies from 'js-cookie'
 import util from './api/util.js'
-import {DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar,DatetimePicker,
-Step, Steps,Lazyload,Popover,Collapse, CollapseItem,TreeSelect  } from 'vant'
+import {
+  DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast, Search, Picker, Uploader, Notify, ContactList, Calendar, Radio, RadioGroup, Tag, Tabbar, TabbarItem, Sticky, Grid, GridItem, Skeleton, Col, Row, Image as VanImage, Badge, NoticeBar, DatetimePicker,
+  Step, Steps, Lazyload, Popover, Collapse, CollapseItem, TreeSelect, Switch
+} from 'vant'
 import 'lib-flexible/flexible'
 import vueEsign from 'vue-esign'
 Vue.use(vueEsign)
 Vue.prototype.util = util
 Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify)
-.use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
-.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar).use(DatetimePicker).use(Step).use(Steps).use(Popover).use(Lazyload).use(Collapse).use(CollapseItem).use(TreeSelect)
+  .use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
+  .use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar).use(DatetimePicker).use(Step).use(Steps).use(Popover).use(Lazyload).use(Collapse).use(CollapseItem).use(TreeSelect)
 Vue.use(DropdownMenu);
+Vue.use(Switch);
 Vue.use(DropdownItem);
 // 引用高德地图组件 main.js
 import VueAMap from 'vue-amap'
@@ -65,7 +68,7 @@ Vue.prototype.$md5 = md5;
 Vue.prototype.qs = qs;
 
 
-Array.prototype.remove = function(val) {
+Array.prototype.remove = function (val) {
   var index = this.indexOf(val);
   if (index > -1) {
     this.splice(index, 1);

src/views/riskProject/add/index.vue

@@ -389,13 +389,6 @@ export default {
       this.currentDate = new Date();
     },
     getLeaderUserList(e) {
-      if (!this.form.projectId) {
-        this.$toast({
-          title: "提示",
-          message: "请选择关联项目!"
-        });
-        return false;
-      }
       this.userPrefix = e;
       this.$toast.loading({
         message: "加载中...",
@@ -439,14 +432,6 @@ export default {
       this.projectDept = false;
     },
     getExecuteUser() {
-      if (!this.form.projectId) {
-        this.$toast({
-          title: "提示",
-          message: "请选择关联项目!"
-        });
-        return false;
-      }
-
       this.filedName = "nickName";
       this.$toast.loading({
         message: "加载中...",

vue.config.js

@@ -8,11 +8,11 @@ module.exports = {
     //以上的ip和端口是我们本机的;下面为需要跨域的
     proxy: { //配置跨域
       '/app-api': {
-        target: 'http://192.168.4.232:8080/', //这里是后台的地址
+        // target: 'http://192.168.4.232:8080/', //这里是后台的地址
         // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
         // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
         // target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
-        // target: 'http://localhost:8080/', //这里是后台的地址
+        target: 'http://localhost:8081/', //这里是后台的地址
         ws: true,
         changOrigin: true, //允许跨域 
         // logLevel: 'debug',  // 显示代理调试信息