zhangjinxing 3 gadi atpakaļ
vecāks
revīzija
9fb58f0b73

+ 1 - 1
src/apis/service/purchaseIn/addStore/index.js

@@ -9,7 +9,7 @@ export default {
   // 分页查询
   list: (data, params) => http(api + "list", data, "post", params),
   // 详情
-  detail: (data, params) => http(api + "detail", data, "post", params),
+  detail: (data, params) => http(api + "wareinfo", data, "post", params),
   // 更新
   update: (data, params) => http(api + "update", data, "post", params),
   // 修改状态

+ 299 - 144
src/views/purchaseIn/addStore/index.vue

@@ -3,144 +3,276 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <el-col :span="24">
-        <el-form
-          ref="ruleForm"
-          :model="ruleForm"
-          status-icon
-          :rules="rulesThis"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
-          <el-divider content-position="center">仓库信息:</el-divider>
-          <el-row>
-            <el-col :span="12"
-              ><el-form-item label="所属公司" prop="storeToCompany">
-                <el-cascader
-                  placeholder="请选择所属公司"
-                  filterable
-                  clearable
-                  style="width: 100%"
-                  :size="searchSize"
-                  v-model="ruleForm.storeToCompany"
-                  :options="ruleForm.selectStock_go_options"
-                  @change="getValue"
-                ></el-cascader>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="仓库名称" prop="stockName">
-                <el-input
-                  placeholder="请输入仓库名称"
-                  filterable
-                  clearable
-                  :size="searchSize"
-                  v-model="ruleForm.stockName"
-                  @change="getValue1"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <!-- 省/市/区选择组件 -->
-              <el-form-item label="省/市/区" prop="stockToArea">
-                <AreaSelect @areaSelect="areaSelect"></AreaSelect>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12"
-              ><!-- 仓库详细地址 -->
-              <el-form-item label="详细地址" prop="stockDetail">
-                <el-input
-                  :size="searchSize"
-                  placeholder="请输入内容"
-                  v-model="ruleForm.stockDetail"
-                  clearable
-                  @change="stockDetail"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="负责人" prop="stockCharge" style="width: 50%">
-            <el-select
-              :size="searchSize"
-              @change="getValue2"
-              style="width: 100%"
-              v-model="ruleForm.stockCharge"
-              placeholder="请选择仓库负责人"
+      <el-form
+        ref="ruleForm"
+        :model="ruleForm"
+        status-icon
+        :rules="rulesThis"
+        label-width="100px"
+        class="demo-ruleForm"
+        v-if="addId === 'add'"
+      >
+        <el-divider content-position="center">仓库信息:</el-divider>
+        <el-row>
+          <el-col :span="12"
+            ><el-form-item label="所属公司" prop="storeToCompany">
+              <el-cascader
+                placeholder="请选择所属公司"
+                filterable
+                clearable
+                style="width: 100%"
+                :size="searchSize"
+                v-model="ruleForm.storeToCompany"
+                :options="ruleForm.selectStock_go_options"
+                @change="getValue"
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="stockName">
+              <el-input
+                placeholder="请输入仓库名称"
+                filterable
+                clearable
+                :size="searchSize"
+                v-model="ruleForm.stockName"
+                @change="getValue1"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <!-- 省/市/区选择组件 -->
+            <el-form-item label="省/市/区" prop="stockToArea">
+              <AreaSelect @areaSelect="areaSelect"></AreaSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"
+            ><!-- 仓库详细地址 -->
+            <el-form-item label="详细地址" prop="stockDetail">
+              <el-input
+                :size="searchSize"
+                placeholder="请输入内容"
+                v-model="ruleForm.stockDetail"
+                clearable
+                @change="stockDetail"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="负责人" prop="stockCharge" style="width: 50%">
+          <el-select
+            :size="searchSize"
+            @change="getValue2"
+            style="width: 100%"
+            v-model="ruleForm.stockCharge"
+            placeholder="请选择仓库负责人"
+          >
+            <el-option
+              v-for="item in ruleForm.stockDutyer_options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-option
-                v-for="item in ruleForm.stockDutyer_options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              <span style="float: left">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.value
+              }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-divider content-position="center">收发货信息:</el-divider>
+        <!-- 收发货联系信息 -->
+
+        <el-row>
+          <el-col :span="12"
+            ><!-- 收发货联系人 -->
+            <el-form-item label="联系人" prop="linker">
+              <el-input
+                :size="searchSize"
+                placeholder="请填写联系人"
+                v-model="ruleForm.linker"
+                clearable
+                @change="linker"
               >
-                <span style="float: left">{{ item.label }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{
-                  item.value
-                }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-divider content-position="center">收发货信息:</el-divider>
-          <!-- 收发货联系信息 -->
+              </el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <!-- 联系人电话 -->
+            <el-form-item label="电话" prop="linker_mobile">
+              <el-input
+                type="number"
+                :size="searchSize"
+                placeholder="请输入联系人电话"
+                v-model="ruleForm.linker_mobile"
+                clearable
+                @change="linkerMobile"
+              >
+              </el-input> </el-form-item
+          ></el-col>
+        </el-row>
 
-          <el-row>
-            <el-col :span="12"
-              ><!-- 收发货联系人 -->
-              <el-form-item label="联系人" prop="linker">
-                <el-input
-                  :size="searchSize"
-                  placeholder="请填写联系人"
-                  v-model="ruleForm.linker"
-                  clearable
-                  @change="linker"
-                >
-                </el-input> </el-form-item
-            ></el-col>
-            <el-col :span="12">
-              <!-- 联系人电话 -->
-              <el-form-item label="电话" prop="linker_mobile">
-                <el-input
-                  type="number"
-                  :size="searchSize"
-                  placeholder="请输入联系人电话"
-                  v-model="ruleForm.linker_mobile"
-                  clearable
-                  @change="linkerMobile"
-                >
-                </el-input> </el-form-item
-            ></el-col>
-          </el-row>
+        <el-row>
+          <el-col :span="12">
+            <!-- 收发货地址 -->
+            <el-form-item label="省/市/区" prop="linker_addr">
+              <AreaSelect @areaSelect="selectArea"></AreaSelect> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <!-- 收发货详细地址 -->
+            <el-form-item label="详细地址" prop="linker_detail">
+              <el-input
+                :size="searchSize"
+                placeholder="请输入详细地址"
+                v-model="ruleForm.linker_detail"
+                clearable
+                @change="linkerDetail"
+              >
+              </el-input> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+
+      <el-form
+        ref="ruleForm"
+        :disabled="addId === 'detail'"
+        :model="ruleForm"
+        status-icon
+        :rules="rulesThis"
+        label-width="100px"
+        class="demo-ruleForm"
+        v-if="addId === 'detail'"
+      >
+        <el-divider content-position="center">仓库信息:</el-divider>
+        <el-row>
+          <el-col :span="12"
+            ><el-form-item label="所属公司" prop="storeToCompany">
+              <el-cascader
+                placeholder="请选择所属公司"
+                filterable
+                clearable
+                style="width: 100%"
+                :size="searchSize"
+                v-model="ruleForm.storeToCompany"
+                :options="ruleForm.selectStock_go_options"
+                @change="getValue"
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="stockName">
+              <el-input
+                placeholder="请输入仓库名称"
+                filterable
+                clearable
+                :size="searchSize"
+                v-model="ruleForm.stockName"
+                @change="getValue1"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <!-- 省/市/区选择组件 -->
+            <el-form-item label="省/市/区" prop="stockToArea">
+              <AreaSelect @areaSelect="areaSelect"></AreaSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"
+            ><!-- 仓库详细地址 -->
+            <el-form-item label="详细地址" prop="stockDetail">
+              <el-input
+                :size="searchSize"
+                placeholder="请输入内容"
+                v-model="ruleForm.stockDetail"
+                clearable
+                @change="stockDetail"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="负责人" prop="stockCharge" style="width: 50%">
+          <el-select
+            :size="searchSize"
+            @change="getValue2"
+            style="width: 100%"
+            v-model="ruleForm.stockCharge"
+            placeholder="请选择仓库负责人"
+          >
+            <el-option
+              v-for="item in ruleForm.stockDutyer_options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+              <span style="float: left">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.value
+              }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-divider content-position="center">收发货信息:</el-divider>
+        <!-- 收发货联系信息 -->
+
+        <el-row>
+          <el-col :span="12"
+            ><!-- 收发货联系人 -->
+            <el-form-item label="联系人" prop="linker">
+              <el-input
+                :size="searchSize"
+                placeholder="请填写联系人"
+                v-model="ruleForm.linker"
+                clearable
+                @change="linker"
+              >
+              </el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <!-- 联系人电话 -->
+            <el-form-item label="电话" prop="linker_mobile">
+              <el-input
+                type="number"
+                :size="searchSize"
+                placeholder="请输入联系人电话"
+                v-model="ruleForm.linker_mobile"
+                clearable
+                @change="linkerMobile"
+              >
+              </el-input> </el-form-item
+          ></el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <!-- 收发货地址 -->
+            <el-form-item label="省/市/区" prop="linker_addr">
+              <AreaSelect @areaSelect="selectArea"></AreaSelect> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <!-- 收发货详细地址 -->
+            <el-form-item label="详细地址" prop="linker_detail">
+              <el-input
+                :size="searchSize"
+                placeholder="请输入详细地址"
+                v-model="ruleForm.linker_detail"
+                clearable
+                @change="linkerDetail"
+              >
+              </el-input> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
 
-          <el-row>
-            <el-col :span="12">
-              <!-- 收发货地址 -->
-              <el-form-item label="省/市/区" prop="linker_addr">
-                <AreaSelect
-                  @areaSelect="selectArea"
-                ></AreaSelect> </el-form-item
-            ></el-col>
-            <el-col :span="12">
-              <!-- 收发货详细地址 -->
-              <el-form-item label="详细地址" prop="linker_detail">
-                <el-input
-                  :size="searchSize"
-                  placeholder="请输入详细地址"
-                  v-model="ruleForm.linker_detail"
-                  clearable
-                  @change="linkerDetail"
-                >
-                </el-input> </el-form-item
-            ></el-col>
-          </el-row>
-        </el-form>
-      </el-col>
       <el-col :span="24" style="text-align: right">
         <el-button
-          v-if="!isDetail"
+          v-if="addId === 'add'"
           type="primary"
           @click="submitForm('ruleForm')"
           >保 存
@@ -323,14 +455,12 @@ export default {
   },
   watch: {
     $route: function (val, old) {
-      console.log(val.query.id);
       this.addId = val.query.id;
     },
   },
   mounted() {
-    console.log(this.$route);
     // console.log(this.$route.query);
-    // this.addId = this.$route.query.id;
+    this.addId = this.$route.query.id;
     this.getCompany();
     this.initForm();
     // this.addStock();
@@ -396,6 +526,7 @@ export default {
         selectStock_go_options: [],
         stockDutyer_options: [],
       };
+      console.log(this.addId);
       if (this.addId === "add") {
         console.log("新建仓库节点");
         console.log(this.ruleForm);
@@ -403,15 +534,12 @@ export default {
         await this.resetForm();
       } else if (this.addId === "detail") {
         console.log("detail");
-        if (this.isDetail) {
-          this.title = "账号详情";
-          this.rulesThis = {};
-        } else {
-          this.title = "修改账号";
-          this.rulesThis = this.rules;
-        }
+        this.rulesThis = {};
         await this.resetForm(this.sitem);
         // await this.initData()
+      } else {
+        console.log("当前是编辑按钮");
+        this.rulesThis = this.rules;
       }
       this.loading = false;
     },
@@ -480,10 +608,11 @@ export default {
     },
     async submitForm(formName) {
       console.log(this.parmValue);
+      console.log(this.$refs[formName].validate);
       this.$refs[formName].validate((valid) => {
         console.log(valid);
         if (valid) {
-          alert("submit!");
+          console.log("submit!");
           this.getList();
         } else {
           console.log("error submit!!");
@@ -587,7 +716,33 @@ export default {
       }
       this.loading = false;
     },
-    async getStockArea() {},
+    // 获取仓库详情
+    async getStocDetail() {
+      this.loading = true;
+      // console.log(this.parmValue);
+      const res = await asyncRequest.detail(5);
+      if (res && res.code === 0 && res.data) {
+        console.log(res.data.list);
+        res.data.list.forEach((element) => {
+          // console.log(element.nickname);
+          let company = {
+            label: element.name,
+            value: element.code,
+          };
+          this.ruleForm.selectStock_go_options.push(company);
+          // this.ruleForm.stockDutyer_options.push(dutyer);
+        });
+        console.log(this.ruleForm.selectStock_go_options);
+        // this.tableData = res.data.list;
+        // this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        // this.tableData = [];
+        // this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
   },
 };
 </script>

+ 16 - 1
src/views/purchaseIn/storeSet/index.vue

@@ -154,7 +154,22 @@
                   type="primary"
                   @click="addList('detail')"
                 >
-                  新111
+                  详情
+                </el-button>
+              </el-col>
+
+              <el-col
+                :span="3"
+                style="width: 56px; margin-left: 10px"
+                class="mr10"
+              >
+                <el-button
+                  class="fl"
+                  :size="searchSize"
+                  type="primary"
+                  @click="addList('edit')"
+                >
+                  编辑
                 </el-button>
               </el-col>