暂存

src/views/goodStore/active/index.vue

@@ -95,6 +95,7 @@
                 :isDetail="false"
                 @searchChange="company_idsearchChange"
               />
+              
             </el-col>
             <el-col :span="4" style="width: 373px; padding: 0 0 0 10px">
               <el-input
@@ -294,7 +295,6 @@ export default {
     },
 
    async company_idsearchChange(e) {
-    
         const { id, code, label } = e;
         this.parmValue.company_id = code || "";
          this.pageInfo.curr = 1;

src/views/sellOut/zxDiffOrder/detail.vue

@@ -5,7 +5,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <div class="detail-page-title">
-        <span>咨询工差单详情：</span>
+        <span>工差单详情：</span>
       </div>
       <status-bar
         v-if="newTime !== ''"

src/views/serviceParam/storeSet/addEdit.vue

@@ -20,6 +20,7 @@
             ref="ruleForm"
             :model="ruleForm"
             status-icon
+            :size="'mini'"
             :rules="rulesThis"
             label-width="100px"
             class="demo-ruleForm"
@@ -31,30 +32,32 @@
             <el-row>
               <el-col :span="12"
                 ><el-form-item
-                  label="业务公司"
+                label-width="140px"
+                  label="仓库所在业务公司"
                   prop="supplierNo"
-                  style="width: 100%"
                 >
                   <search-work-company
-                    :value="ruleForm.supplierNo"
-                    :names="supplier_name"
-                    :is-detail="id !== 'add'"
-                    :disabled="isDetail"
-                    :placeholder="'业务公司名称'"
-                    @searchChange="supplierChange"
+                    :value="ruleForm.company_id"
+                    :placeholder="'业务公司'"
+                    :disabled="false"
+                    :size="'mini'"
+                    :isDetail="false"
+                    @searchChange="company_idsearchChange"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="12"
                 ><el-form-item
-                  label="仓库公司"
+                  label="仓库所在公司"
                   prop="supplierNo"
+                   label-width="120px"
                   style="width: 100%"
                 >
                   <search-supplier
                     :value="ruleForm.supplierNo"
                     :names="supplier_name"
                     :is-detail="id !== 'add'"
+                    :size="'mini'"
                     :disabled="isDetail"
                     :placeholder="'仓库公司名称'"
                     @searchChange="supplierChange"
@@ -74,18 +77,31 @@
                   </el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="仓库类型" prop="wsmtype">
+                  <el-select v-model="ruleForm.wsmtype" style="width:100%"  placeholder="仓库类型">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="负责人"
+                  label="仓库负责人"
                   prop="contactor"
                   style="width: 100%"
                 >
                   <search-account
-                    :size="searchSize"
                     :value="ruleForm.contactor"
-                    :placeholder="'负责人'"
+                    :placeholder="'仓库负责人'"
                     :is-detail="id !== 'add'"
                     :disabled="isDetail"
+                    :size="'mini'"
                     :names="accountNames"
                     @searchChange="accountChange"
                   /> </el-form-item
@@ -102,20 +118,21 @@
                   </el-input> </el-form-item
               ></el-col>
               <el-col :span="12">
-                <el-form-item label="省/市/区" prop="addr_code">
+                <el-form-item label="仓库所在省/市/区" prop="addr_code" label-width="140px">
                   <select-area
-                    :placeholder="'省/市/区'"
+                    :placeholder="'仓库所在省/市/区'"
                     :value="ruleForm.addr_code"
                     :is-detail="id !== 'add'"
+                    :size="'mini'"
                     :disabled="isDetail"
                     @selectChange="selectAreaAddr_code"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="详细地址" prop="addr">
+              <el-col :span="12">
+                <el-form-item label="仓库所在详细地址" prop="addr" label-width="140px">
                   <el-input
-                    placeholder="详细地址"
+                    placeholder="仓库所在详细地址"
                     v-model="ruleForm.addr"
                     maxlength="100"
                     clearable
@@ -130,9 +147,9 @@
             </div>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="联系人" prop="wsm_name">
+                <el-form-item label="收发货联系人" prop="wsm_name" label-width="110px">
                   <el-input
-                    placeholder="联系人"
+                    placeholder="收发货联系人"
                     maxlength="20"
                     :disabled="isDetail"
                     v-model="ruleForm.wsm_name"
@@ -141,9 +158,9 @@
                   </el-input> </el-form-item
               ></el-col>
               <el-col :span="12">
-                <el-form-item label="电话" prop="wsm_mobile">
+                <el-form-item label="收发货电话" prop="wsm_mobile">
                   <el-input
-                    placeholder="联系人电话"
+                    placeholder="收发货电话"
                     v-model="ruleForm.wsm_mobile"
                     maxlength="11"
                     :disabled="isDetail"
@@ -155,19 +172,20 @@
 
             <el-row>
               <el-col :span="12">
-                <el-form-item label="省/市/区" prop="addrs_code">
+                <el-form-item label="收发货省/市/区" prop="addrs_code" label-width="121px">
                   <select-area
                     :is-detail="id !== 'add'"
                     :disabled="isDetail"
+                    :size="'mini'"
                     :value="ruleForm.addrs_code"
-                    :placeholder="'省/市/区'"
+                    :placeholder="'收发货省/市/区'"
                     @selectChange="selectAreaAddrs_code"
                   /> </el-form-item
               ></el-col>
               <el-col :span="12">
-                <el-form-item label="详细地址" prop="wsm_addr">
+                <el-form-item label="收发货详细地址" prop="wsm_addr" label-width="126px">
                   <el-input
-                    placeholder="详细地址"
+                    placeholder="收发货详细地址"
                     maxlength="100"
                     :disabled="isDetail"
                     v-model="ruleForm.wsm_addr"
@@ -179,10 +197,14 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button type="primary" @click="submitForm" v-if="!isDetail"
+          <el-button
+            type="primary"
+            :size="'mini'"
+            @click="submitForm"
+            v-if="!isDetail"
             >保 存
           </el-button>
-          <el-button @click="showModelThis = false">{{
+          <el-button :size="'mini'" @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -236,7 +258,18 @@ export default {
       loading: false,
       title: "添加仓库",
       showModelThis: this.showModel,
+      options: [
+        {
+          value: "1",
+          label: "销售仓",
+        },
+          {
+          value: "0",
+          label: "次品仓",
+        },
+      ],
       ruleForm: {
+        company_id: "",
         name: "", // 仓库名称
         supplierNo: [], //供应商编码
         // wsmtype: "", //仓库类型 目前随便填
@@ -263,6 +296,13 @@ export default {
             trigger: "blur",
           },
         ],
+        company_id: [
+          {
+            required: true,
+            message: "业务公司不能为空",
+            trigger: "change",
+          },
+        ],
         supplierNo: [
           {
             type: "array",
@@ -355,6 +395,12 @@ export default {
     },
   },
   methods: {
+    //业务公司选择
+    async company_idsearchChange(e) {
+      const { id, code, label } = e;
+      this.ruleForm.company_id = code || "";
+      this.$refs.ruleForm.validateField("company_id");
+    },
     //供应商公司选择
     supplierChange(e) {
       if (e && e.id) {
@@ -420,11 +466,13 @@ export default {
           wsm_code,
           wsm_mobile,
           wsm_name,
+          company_id,
         } = res.data;
 
         this.supplier_name = supplier_name;
         this.accountNames = contactor_name;
         this.ruleForm = {
+          company_id: company_id || "",
           name: name, // 仓库名称
           supplierNo: [supplierNo], //供应商编码
           // wsmtype: "", //仓库类型 目前随便填
@@ -459,6 +507,7 @@ export default {
           this.supplier_name = "";
           this.accountNames = "";
           this.ruleForm = {
+            company_id: "",
             name: "", // 仓库名称
             supplierNo: [], //供应商编码
             // wsmtype: "", //仓库类型 目前随便填