Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/views/basic_data/dealer/dealer_stock.vue

@@ -9,60 +9,68 @@
     :tableAttributes="tableAttributes"
     :columnParsing="columnParsing"
   >
-    <el-dialog :title="title" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
-      <el-form ref="addForm" :model="addForm" :rules="rules" label-width="100px" label-position="right">
-        <el-form-item label="经销商名称" prop="customerId">
-          <el-select
-            filterable
-            class="selectStyle"
-            v-model="addForm.customerId"
-            placeholder="请选择"
-            @change="changeFn"
-          >
-            <el-option v-for="item in dealerList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="经销商编码" prop="customerNumber">
-          <el-input disabled v-model="addForm.customerNumber"></el-input>
-        </el-form-item>
-        <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
-          <el-select class="selectStyle" v-model="addForm.k3OrgNumber" placeholder="请选择" filterable>
-            <el-option
-              v-for="item in k3DepartmentList"
-              :key="item.number"
-              :label="item.name + '（' + item.number + '）'"
-              :value="item.number"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="钱包" prop="customerWalletId">
-          <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
-            <el-option
-              v-for="item in walletList"
-              :key="item.customerWalletId"
-              :label="item.customerWalletName"
-              :value="item.customerWalletId"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="区域" prop="region">
-          <el-cascader
-            ref="locationCascader"
-            v-model="addForm.region"
-            class="selectStyle"
-            :options="options"
-            :props="props"
-            clearable
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="对应业务员" prop="serviceId">
-          <el-select class="selectStyle" v-model="addForm.serviceId" placeholder="请选择" filterable>
-            <el-option v-for="(item, i) in userList" :key="i" :label="item.nickName" :value="item.adminUserId">
-            </el-option>
-          </el-select>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="dialogForm" width="50%" :show-close="false" :close-on-click-modal="false">
+      <el-form ref="addForm" :model="addForm" :rules="rules" label-width="100px" label-position="left">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="经销商名称" prop="customerId">
+              <el-select
+                filterable
+                class="selectStyle"
+                v-model="addForm.customerId"
+                placeholder="请选择"
+                @change="changeFn"
+              >
+                <el-option v-for="item in dealerList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="经销商编码" prop="customerNumber">
+              <el-input disabled v-model="addForm.customerNumber"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
+              <el-select class="selectStyle" v-model="addForm.k3OrgNumber" placeholder="请选择" filterable>
+                <el-option
+                  v-for="item in k3DepartmentList"
+                  :key="item.number"
+                  :label="item.name + '（' + item.number + '）'"
+                  :value="item.number"
+                >
+                </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="钱包" prop="customerWalletId">
+              <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
+                <el-option
+                  v-for="item in walletList"
+                  :key="item.customerWalletId"
+                  :label="item.customerWalletName"
+                  :value="item.customerWalletId"
+                >
+                </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="区域" prop="region">
+              <el-cascader
+                ref="locationCascader"
+                v-model="addForm.region"
+                class="selectStyle"
+                :options="options"
+                :props="props"
+                clearable
+              ></el-cascader> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="对应业务员" prop="serviceId">
+              <el-select class="selectStyle" v-model="addForm.serviceId" placeholder="请选择" filterable>
+                <el-option v-for="(item, i) in userList" :key="i" :label="item.nickName" :value="item.adminUserId">
+                </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelFn">取 消</el-button>
@@ -126,7 +134,7 @@ export default {
                 let ids = this.recordSelected.map(v => {
                   return v.id
                 })
-                let params = {ids:ids.toString()}
+                let params = { ids: ids.toString() }
                 await deleDealerStockList(params)
                 this.$refs.pageRef.refreshList()
                 this.$message.success('批量删除成功')