Merge branch 'live' into edit

dist/static/css/chunk-6ea62014.bbdfcc5a.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-abf8e364]{padding:0 0 0 0}.emptyGif[data-v-abf8e364]{display:block;width:100%;margin:0 auto}.dashboard-editor-container[data-v-abf8e364]{background-color:#e3e3e3;min-height:calc(100vh - 84px);width:100%;padding:0 6% 0 0;text-align:center}.dashboard-editor-container .info-container[data-v-abf8e364]{display:block;width:60%;text-align:center;margin:0 auto;padding:10vh 0 0 0}.dashboard-editor-container .info-container .welcome-title[data-v-abf8e364]{vertical-align:top;padding:0;margin:0 0 0 18px;color:#97a8be;display:inline-block;height:130px;line-height:130px;font-size:45px}.dashboard-editor-container img[data-v-abf8e364]{display:block;-webkit-box-flex:1;-ms-flex:1;flex:1}

dist/static/css/chunk-7f60e04e.b33d16ff.css

@@ -0,0 +1 @@
+.change{padding:0 18% 0 0;background:#f2f2f2;min-height:100%;height:100%;overflow:hidden;position:absolute;z-index:2}.change,.change .title{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.change .title{border-width:0;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px}.change-mobile{background:#f2f2f2}@supports (-webkit-mask:none) and (not (cater-color:#fff)){.change-mobile .el-input input{color:#fff}}.change-mobile .el-input input{color:#000}.change-mobile .el-form-item{border:1px solid hsla(0,0%,100%,.1);color:#454545}.change-mobile[data-v-16b4414e]{min-height:100%;width:100%;height:100%;background-color:#f2f2f2;overflow:hidden;position:absolute;z-index:2;background:#fff}.change-mobile .login-form[data-v-16b4414e]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.change-mobile .login-form .el-form-item__label[data-v-16b4414e]{height:49px;line-height:49px}.change-mobile .login-form .el-form-item__content[data-v-16b4414e]:after,.change-mobile .login-form .el-form-item__content[data-v-16b4414e]:before{content:"";display:block;clear:both}.change-mobile .tips[data-v-16b4414e]{font-size:14px;color:#fff;margin-bottom:10px}.change-mobile .tips span[data-v-16b4414e]:first-of-type{margin-right:16px}.change-mobile .svg-container[data-v-16b4414e]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.change-mobile .show-pwd[data-v-16b4414e]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.change-mobile .thirdparty-button[data-v-16b4414e]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.change-mobile .thirdparty-button[data-v-16b4414e]{display:none}}

dist/static/js/chunk-6842880a.b7ca4286.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-6842880a"],{"42d5":function(t,n,e){"use strict";e("f9373")},"7e10":function(t,n,e){"use strict";e.r(n);var a=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"dingLoading"},[t("img",{attrs:{src:e("f8b2"),alt:""}})])}],i={name:"loadingPage",data(){return{}},created(){}},c=(e("42d5"),e("2877"));a=Object(c.a)(i,(function(){var t=this;t.$createElement;return t._self._c,t._m(0)}),a,!1,null,"3427ed7c",null);n.default=a.exports},f8b2:function(t,n,e){t.exports=e.p+"static/img/loading.190c78aa.gif"},f9373:function(t,n,e){}}]);

dist/static/js/chunk-6ea62014.d6bca096.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-6ea62014"],{"05e1":function(t,a,e){"use strict";e("5ca8")},"5ca8":function(t,a,e){},9406:function(t,a,e){"use strict";e.r(a);var i=e("2f62"),c={name:"dashboard",data(){return{emptyGif:e("ff1f")}},computed:{...Object(i.b)(["avatar"])},created(){}};e("05e1"),i=e("2877"),c=Object(i.a)(c,(function(){var t=this,a=t.$createElement;a=t._self._c||a;return a("div",{staticClass:"dashboard-container"},[a("div",{staticClass:"dashboard-editor-container"},[a("div",{staticClass:"info-container clearfix"},[a("pan-thumb",{attrs:{image:t.avatar,width:"130px",height:"130px"}}),a("span",{staticClass:"welcome-title"},[t._v("欢迎登录采销平台订单系统")])],1),a("img",{staticStyle:{width:"60%",margin:"-30px auto 0 auto"},attrs:{src:t.emptyGif}})])])}),[],!1,null,"abf8e364",null);a.default=c.exports},ff1f:function(t,a,e){t.exports=e.p+"static/img/welcome.6cf0f25b.gif"}}]);

dist/static/js/chunk-98a2441c.8c89005b.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-98a2441c"],{"42d5":function(t,n,e){"use strict";e("f9373")},"7e10":function(t,n,e){"use strict";e.r(n);var a=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"dingLoading"},[t("img",{attrs:{src:e("f8b2"),alt:""}})])}],c={name:"loadingPage",data(){return{}},created(){}},i=(e("42d5"),e("2877"));a=Object(i.a)(c,(function(){var t=this;t.$createElement;return t._self._c,t._m(0)}),a,!1,null,"3427ed7c",null);n.default=a.exports},f8b2:function(t,n,e){t.exports=e.p+"static/img/loading.190c78aa.gif"},f9373:function(t,n,e){}}]);

src/App.vue

@@ -6,7 +6,7 @@
 
 <script>
 import { JudgeEnvironment } from "@/utils/validate";
-import asyncRequest from "@/apis/service/test";
+// import asyncRequest from "@/apis/service/test";
 import { getCode } from "@/utils/dingding";
 export default {
   name: "App",

src/components/search-account/main.vue

@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-    :placeholder="placeholder"
+    :placeholder="placeholder||''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -56,14 +56,12 @@ export default {
   data() {
     return {
       options: [],
-      code: [],
       selectLoading: false,
       searchName: "",
     };
   },
   watch: {
     names: function (val, old) {
-      console.log(val, old);
       this.searchName = val;
       if (this.isDetail && this.searchName) {
         this.remoteMethod(this.searchName);

src/components/search-customer/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-select
-    v-model="code"
+    v-model="value"
     multiple
     filterable
     remote
@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-    :placeholder="placeholder"
+     :placeholder="placeholder||''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -31,7 +31,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "SearchCustomer",
   mixins: [resToken],
-  props: ["size", "code", "placeholder", "isDetail", "disabled", "names"],
+  props: ["size", "value", "placeholder", "isDetail", "disabled", "names"],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -48,7 +48,6 @@ export default {
   data() {
     return {
       options: [],
-      code: [],
       selectLoading: false,
       searchName: "",
     };

src/components/search-stock/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-select
-    v-model="code"
+    v-model="value"
     multiple
     filterable
     remote
@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-    :placeholder="placeholder"
+     :placeholder="placeholder||''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -30,7 +30,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "SearchStock",
   mixins: [resToken],
-  props: ["size", "code", "placeholder", "isDetail", "disabled", "names"],
+  props: ["size", "value", "placeholder", "isDetail", "disabled", "names"],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -47,7 +47,6 @@ export default {
   data() {
     return {
       options: [],
-      code: [],
       selectLoading: false,
       searchName: "",
     };

src/components/search-supplier/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-select
-    v-model="code"
+    v-model="value"
     multiple
     filterable
     remote
@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-    :placeholder="placeholder"
+    :placeholder="placeholder||''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -48,7 +48,6 @@ export default {
   data() {
     return {
       options: [],
-      code: [],
       selectLoading: false,
       searchName: "",
     };

src/components/select-area/main.vue

@@ -1,31 +1,54 @@
 <template>
+  <div class="select-area">
     <el-cascader
+      v-if="!loading"
       :size="size || 'medium'"
       style="width: 100%"
       filterable
       clearable
       v-model="value"
+      :placeholder="placeholder || ''"
       :props="props"
+      :disabled="disabled"
       @change="handleChange"
     ></el-cascader>
+    <div class="loading-input" :class="{ disabled: disabled }" v-else>
+      <i class="el-icon-loading"></i>
+      <span>{{ placeholder || "" }}</span>
+    </div>
+  </div>
 </template>
 
 <script>
 import asyncRequest from "@/apis/components/select-area";
 export default {
   name: "SelectArea",
-  props: ["size", "value"],
+  props: ["size", "value", "isDetail", "placeholder", "disabled"],
   /**
    * 属性集合
-   * @param {String}       size       : 组件大小 非必填
-   * @param {Array}        value      : 选中值  必填
+   * @param {String}        size                   : 组件大小 非必填
+   * @param {Array}         value                  : 选中值  必填
+   * @param {String}        placeholder            : 提示信息            非必填
+   * @param {Boolean}       isDetail               : 是否是详情逻辑       必填
+   * @param {Boolean}       disabled               : 是否禁用            必填
    */
   /**
    * 事件集合
    * @selectChange            : 选中值变化调用   抛出选中数据
    */
+  watch: {
+    value: function (val, old) {
+      if (val) {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+        }, 10);
+      }
+    },
+  },
   data() {
     return {
+      loading: false,
       props: {
         lazy: true, //开启远程加载
         async lazyLoad(node, resolve) {
@@ -70,8 +93,27 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .select-area {
-  display: inline-block;
+  .loading-input {
+    background-color: transparent;
+    border: 1px solid #dfe4ed;
+    color: #c0c4cc;
+    width: 100%;
+    height: 36px;
+    line-height: 36px;
+    padding: 0 30px 0 12px;
+    border-radius: 4px;
+    &.disabled {
+      background-color: #f5f7fa;
+    }
+    span {
+      font-size: 16px;
+      height: 36px;
+      line-height: 36px;
+      padding:0 0 0 3px;
+      vertical-align: top;
+    }
+  }
 }
 </style>

src/views/interest/organize/index.vue

@@ -161,7 +161,6 @@ export default {
     return {
       titleList: [],
       sitem: null,
-
       statusList: statusList,
       loading: true,
       showModel: false,

src/views/login/index.vue

@@ -150,12 +150,8 @@ export default {
       ver: "",
       show: false,
       loginForm: {
-        // username: "17744520491",
-        password: "dingding123",
-        // username: "15501067031",
-        // password: "wugg123",
-        username: "18617668688",
-        // password: "",
+        username: "",
+        password: "",
       },
       loginRules: {
         username: [

src/views/purchaseIn/storeSet/addEdit.vue

@@ -24,7 +24,7 @@
             label-width="100px"
             class="demo-ruleForm"
           >
-            <div style="padding: 8px 0 12px 0">
+            <div style="padding: 0 0 12px 0">
               <el-divider content-position="center">仓库信息</el-divider>
             </div>
 
@@ -36,8 +36,9 @@
                   style="width: 100%"
                 >
                   <search-supplier
-                    :value="supplierNo"
+                    :value="ruleForm.supplierNo"
                     :names="supplier_name"
+                    :is-detail="id !== 'add'"
                     :disabled="isDetail"
                     :placeholder="'请输入公司名称'"
                     @searchChange="supplierChange"
@@ -70,7 +71,7 @@
                     :size="searchSize"
                     :value="ruleForm.contactor"
                     :placeholder="'请输入负责人'"
-                    :is-detail="isDetail"
+                    :is-detail="id !== 'add'"
                     :disabled="isDetail"
                     :names="accountNames"
                     @searchChange="accountChange"
@@ -83,6 +84,7 @@
                     v-model="ruleForm.mobile"
                     maxlength="11"
                     clearable
+                    :disabled="isDetail"
                   >
                   </el-input> </el-form-item
               ></el-col>
@@ -93,6 +95,8 @@
                   <select-area
                     :placeholder="'请选择省/市/区'"
                     :value="ruleForm.addr_code"
+                    :is-detail="id !== 'add'"
+                    :disabled="isDetail"
                     @selectChange="selectAreaAddr_code"
                   />
                 </el-form-item>
@@ -104,6 +108,7 @@
                     v-model="ruleForm.addr"
                     maxlength="100"
                     clearable
+                    :disabled="isDetail"
                   >
                   </el-input>
                 </el-form-item>
@@ -130,6 +135,7 @@
                     placeholder="请输入联系人电话"
                     v-model="ruleForm.wsm_mobile"
                     maxlength="11"
+                    :disabled="isDetail"
                     clearable
                   >
                   </el-input> </el-form-item
@@ -140,6 +146,7 @@
               <el-col :span="12">
                 <el-form-item label="省/市/区" prop="addrs_code">
                   <select-area
+                    :is-detail="id !== 'add'"
                     :disabled="isDetail"
                     :value="ruleForm.addrs_code"
                     :placeholder="'请选择省/市/区'"
@@ -151,6 +158,7 @@
                   <el-input
                     placeholder="请输入详细地址"
                     maxlength="100"
+                    :disabled="isDetail"
                     v-model="ruleForm.wsm_addr"
                     clearable
                   >
@@ -213,6 +221,7 @@ export default {
 
     return {
       supplier_name: "",
+      accountNames:"",
       loading: false,
       title: "添加仓库",
       showModelThis: this.showModel,
@@ -404,14 +413,16 @@ export default {
           wsm_name,
         } = res.data;
 
-        this.supplier_name = supplierNo;
+        this.supplier_name = supplier_name;
+        this.accountNames = ""
+        //accountNames||"";
         this.ruleForm = {
           name: name, // 仓库名称
           supplierNo: [supplierNo], //供应商编码
           // wsmtype: "", //仓库类型 目前随便填
-          addr_code: [], //仓库省市区
+          addr_code: this.getCode(addr_code), //仓库省市区
           addr: addr, //仓库详细地址
-          contactor: [], //仓库联系人
+          contactor: contactor ? [contactor] : [], //仓库联系人
           mobile: mobile, //仓库联系方式
           // position: "", //联系人职位  目前随便填
           // wsm_type: "", //目前随便填
@@ -419,9 +430,9 @@ export default {
           wsm_name: wsm_name, //收发货联系人
           wsm_mobile: wsm_mobile, //收发货联系方式
           wsm_addr: wsm_addr, //收发货地址详细
-          addrs_code: [], //收发货省市区
+          addrs_code: this.getCode(addrs_code), //收发货省市区
         };
-        console.log(res.data);
+        console.log(this.ruleForm);
 
         // this.ruleForm = res.data;
         // this.ruleForm.role_id = this.ruleForm.role;
@@ -437,6 +448,8 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          this.supplier_name = "";
+          this.accountNames = "";
           this.ruleForm = {
             name: "测试测试", // 仓库名称
             supplierNo: [], //供应商编码
@@ -459,11 +472,18 @@ export default {
     setCode(list) {
       let model = {
         provice_code: list[0],
-        city_code: list[2],
+        city_code: list[1],
         area_code: list[2],
       };
       return model;
     },
+    getCode(obj) {
+      let arr = [];
+      arr.push(obj.provice_code);
+      arr.push(obj.city_code);
+      arr.push(obj.area_code);
+      return arr;
+    },
     getId(list) {
       let arr = JSON.parse(JSON.stringify(list));
       return arr.join(",");