Browse Source

订单系统

zhangjinxing 3 years ago
parent
commit
ef47043601

+ 4 - 1
src/apis/service/purchaseIn/storeManageFlow/index.js

@@ -13,6 +13,9 @@ export default {
   // 更新
   update: (data, params) => http(api + "update", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + "accountstatus", data, "post", params),
+  status: (data, params) => http(api + "accountstatus", data, "post", params),  // 
+  // 获取仓库列表
+  listAll: (data, params) => http(api + "warelist", data, "post", params),
+
 };
    

+ 30 - 42
src/views/purchaseIn/storeManageFlow/components/newSetStock.vue

@@ -11,20 +11,6 @@
         label-width="120px"
       >
         <el-form-item label="商品名称" prop="goods_name">
-          <!-- <el-cascader
-            placeholder="请选择出库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="ruleForm.selectStock_go"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName(true);
-            "
-          ></el-cascader> -->
           <el-input
             style="width: 30%"
             v-model="ruleForm.goods_name"
@@ -33,20 +19,6 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="采购数量" prop="goods_num">
-          <!-- <el-cascader
-            placeholder="请选择入库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="ruleForm.selectStock_in"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader> -->
           <el-input
             style="width: 30%"
             v-model="ruleForm.goods_num"
@@ -58,7 +30,7 @@
           <el-date-picker
             style="width: 30%"
             :size="searchSize"
-            v-model="ruleForm.goTime"
+            v-model="ruleForm.last_go_stock"
             type="date"
             placeholder="选择日期"
             @change="selectTime"
@@ -67,12 +39,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="入库仓库" prop="stock_in_rule">
-          <!-- <el-cascader
+          <el-cascader
             placeholder="请选择入库仓库"
             filterable
             clearable
             :size="searchSize"
-            v-model="ruleForm.selectStock_in"
+            v-model="ruleForm.stock_in_rule"
             :options="options"
             style="width: 30%"
             @change="
@@ -80,9 +52,11 @@
               parmValue.page = 1;
               stockName();
             "
-          ></el-cascader> -->
+          ></el-cascader>
           <el-col :span="24" style="text-align: right; margin-top: 10px">
-            <el-button type="primary" @click="save">保 存 </el-button>
+            <el-button type="primary" @click="save('ruleForm')"
+              >保 存
+            </el-button>
             <el-button type="warning" @click="submitForm('ruleForm')"
               >保 存 并 发 起 流 程
             </el-button>
@@ -98,9 +72,9 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+// import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
-import asyncRequest from "@/mock/service/stock/newApply";
+import asyncRequest from "@/apis/service/purchaseIn/storeManageFlow";
 import { mapGetters } from "vuex";
 
 export default {
@@ -126,7 +100,8 @@ export default {
       ruleForm: {
         goods_name: "", //商品名称
         goods_num: "", //商品数量
-        goTime: "", //最晚入库时间
+        last_go_stock: "", //最晚入库时间
+        stock_in_rule: "",
       },
       rules: {
         //出入库规则
@@ -149,14 +124,15 @@ export default {
             // type: "date",
             required: true,
             message: "请输入入库最晚时间",
-            trigger: "blur",
+            // trigger: "blur" ,
+            trigger: ["blur", "change"],
           },
         ],
-        stock_go_product: [
+        stock_in_rule: [
           {
             required: true,
             message: "请选择入库仓库",
-            trigger: "blur",
+            trigger: "change",
           },
         ],
       },
@@ -207,16 +183,28 @@ export default {
   },
   mounted() {
     // this.searchList();
-    // this.stockName(); //假数据,获取二级仓库名
+    // this.stockName; //假数据,获取二级仓库名
+    console.log(this.stockName);
+    console.log(this.selectTime);
   },
 
   methods: {
     selectTime(e) {
       console.log(e);
       console.log(e.toString());
+      this.ruleForm.goTime = e;
+      console.log();
     },
-    save() {
+    save(formName) {
       console.log("save");
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
     submitForm(formName) {
       console.log("sds");
@@ -320,7 +308,7 @@ export default {
   async stockName(isShowModal = false) {
     //获取多级仓库名称的方法
     const res = await asyncRequest.listAll(this.parmValue);
-    // console.log(res.data);
+    console.log(res.data);
     // this.openModal("005", true);
     // console.log(this.selectStock_go);
     // console.log(this.selectStock_in);