Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/CommodityMan/goodsListEdit.vue

@@ -180,8 +180,8 @@
                     </el-switch>
                   </el-form-item>
                   <el-form-item label="是否可开发票" v-if="isShowTax">
-                    <el-switch v-model="addMsg.IsNoTax" active-color="#409EFF" :active-value="1"
-                      :inactive-value="0">
+                    <el-switch v-model="addMsg.IsNoTax" active-color="#409EFF" :active-value="0"
+                      :inactive-value="1">
                     </el-switch>
                   </el-form-item>
                   <el-form-item label="自动上架时间">

src/components/StoreDesign/CashierWithdrawal.vue

@@ -15,8 +15,7 @@
                   </el-form-item>
                   <el-form-item label="到账账号：">
                     <el-select class="w160" v-model="msg.User_Id" size="small" placeholder="请选择">
-                      <el-option v-for="item in AccountList" :key="item.EmpId" :label="item.EmpName"
-                        :value="item.EmpId">
+                      <el-option v-for="item in createrList" :key="item.Id" :label="item.Name" :value="item.Id">
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -33,15 +32,15 @@
                   <span>到账账户：
                     <el-select class="w150" v-model="awalMsg.User_Id" size="small" placeholder="请选择">
                       <el-option label="不限" :value="0"></el-option>
-                      <el-option v-for="item in AccountList" :key="item.EmpId" :label="item.EmpName"
-                        :value="item.EmpId">
+                      <el-option v-for="item in createrList" :key="item.Id" :label="item.Name" :value="item.Id">
                       </el-option>
                     </el-select>
                   </span>
                   <span>创建人：
                     <el-select class="w150" v-model="awalMsg.CreateBy" size="small" placeholder="请选择">
                       <el-option label="不限" :value="0"></el-option>
-                      <el-option v-for="item in createrList" :key="item.Id" :label="item.Name" :value="item.Id">
+                      <el-option v-for="item in AccountList" :key="item.EmpId" :label="item.EmpName"
+                        :value="item.EmpId">
                       </el-option>
                     </el-select>
                   </span>
@@ -242,6 +241,7 @@
         mounted() {
           this.getMoney();
           this.getAccountList();
+          this.getCreaterList();
         }
       };