Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/supply.js

@@ -275,11 +275,12 @@ export function updatesupply(data) {
   })
 }
 
-// export function updatesupply(data) {
+
+// export function getsupplytype(params) {
 //   return request({
-//     url: '/api/supply/updatesupply' ,
-//     method: 'post',
-//     data: data
+//     url: '/api/supply/getsupplytype' ,
+//     method: 'get',
+//     params: params
 //   })
 // }
 

src/xt_pages/supply/components/addSupply.vue

@@ -60,12 +60,7 @@
         </el-row>
       </el-form>
 
-      <el-form
-        :rules="tableRules"
-        :model="recordInfo"
-        ref="recordInfo"
-        class="tableclass"
-      >
+      <el-form :model="recordInfo" ref="recordInfo" class="tableclass">
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -83,10 +78,21 @@
             <template slot="header" slot-scope="scope">
               <span>联系人<span style="color: red">*</span></span>
             </template>
+            <!-- tableRules.name -->
             <template slot-scope="scope">
               <el-form-item
                 :prop="'contacts.' + scope.$index + '.name'"
-                :rules="tableRules.name"
+                :rules="
+                  scope.row.name != ''
+                    ? [
+                        {
+                          required: 'true',
+                          message: '请输入主要联系人',
+                          trigger: ['blur', 'change'],
+                        },
+                      ]
+                    : null
+                "
               >
                 <el-input
                   v-model="scope.row.name"
@@ -362,8 +368,17 @@ export default {
             this.$refs[formName].validate((valid) => {
               if (valid) {
                 let params = {
-                  ...this.supplier,
-                  ...this.recordInfo,
+                  suppliercode: this.supplier.supplierCode,
+                  suppliername: this.supplier.supplierName,
+                  // ...this.recordInfo
+                  id: parseInt(this.supplier_ids),
+                  // id:JSON.parse(this.supplier_ids),
+                  suppliertype: "",
+                  vatrate: "",
+                  number: "",
+                  bank: "",
+                  bankaccount: "",
+                  contacts: [...this.recordInfo.contacts],
                 };
                 console.log(params, "dhas");
                 savesupply(params).then((res) => {});
@@ -383,15 +398,20 @@ export default {
             this.$refs[formName].validate((valid) => {
               if (valid) {
                 let params = {
-                  suppliercode:this.supplier.supplierCode,
-                  suppliername:this.supplier.supplierName,
-                  tmp:"测试",
+                  suppliercode: this.supplier.supplierCode,
+                  suppliername: this.supplier.supplierName,
                   // ...this.recordInfo
-                  id:this.supplier_ids,
-                  contacts:[...this.recordInfo.contacts]
+                  id: parseInt(this.supplier_ids),
+                  // id:JSON.parse(this.supplier_ids),
+                  suppliertype: "",
+                  vatrate: "",
+                  number: "",
+                  bank: "",
+                  bankaccount: "",
+                  contacts: [...this.recordInfo.contacts],
                 };
                 console.log(this.recordInfo, "dhas");
-                console.log(typeof(this.supplier_ids),'oo')
+                console.log(typeof this.supplier_ids, "oo");
                 updatesupply(params).then((res) => {
                   console.log(res, "oo");
                 });

src/xt_pages/supply/goodOrderQuery.vue

@@ -267,11 +267,9 @@ export default {
           page:this.page,
           limit:this.limit,
         }
-       console.log("param2323322332",params)
        getAllGoodOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
-            console.log("购货单列表",list)
             this.tableList = list
             var total = response.data.data.total
             this.total = total
@@ -341,7 +339,6 @@ export default {
        this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
      },
      toDelete(val,index){
-       console.log("val323223233223",val)
        if(val.is_check == 1){
          this.$message.error("已审核单据，不能删除!")
          return false

src/xt_pages/supply/supplyQuery.vue

@@ -15,52 +15,19 @@
         <div>
           <el-select
             v-model="type_name"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
+            style="width: 170px; margin-right: 10px"
+            placeholder="请选择供应商类别"
             @change="changeTypeName"
           >
             <el-option
-              v-for="item in types"
+              v-for="item in sType"
               :key="item.id"
-              :label="item.type_name"
-              :value="item.id"
+              :label="item.name"
+              :value="item.value"
             >
             </el-option>
           </el-select>
-          <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="startTimeChange"
-          ></el-date-picker
-          >-
-          <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="endTimeChange"
-          ></el-date-picker>
-          <el-input
-            size="small"
-            style="width: 200px; margin-left: 10px"
-            class="filter-item"
-            v-model.trim="keywords"
-            placeholder="耗材名称"
-          />
+
           <el-button
             size="small"
             class="filter-item"
@@ -90,7 +57,7 @@
       >
         <el-table-column prop="SupplierType" label="供应商类别" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.SupplierType }}</span>
+            <span>{{ scope.row.TypeName }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="SupplierCode" label="供应商编码" align="center">
@@ -175,13 +142,11 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import addSupply from "./components/addSupply.vue";
-import {
-  getexporthistory,
-  delsupplys
-} from "@/api/supply";
+import { getexporthistory, delsupplys, getsupplytype } from "@/api/supply";
 export default {
   name: "stockIn",
   created() {
+    this.getsupplytype();
     // this.initSupplierData()
     this.org_id = this.$store.getters.xt_user.org_id;
 
@@ -207,7 +172,7 @@ export default {
       page: 1,
       limit: 10,
 
-      type_name: "",
+      type_name: 0,
       crumbs: [
         { path: false, name: "采购管理" },
         { path: "/supply/good/order/query", name: "供应商管理" },
@@ -226,13 +191,16 @@ export default {
       types: [],
       tableList: [],
       tyep_name: "",
+      sType: [],
     };
   },
+
   methods: {
     initData() {
       let params = {
         limit: this.limit,
         page: this.page,
+        ctype: this.type_name,
       };
       getexporthistory(params).then((res) => {
         if (res.data.state == 1) {
@@ -242,6 +210,15 @@ export default {
       });
     },
 
+    getsupplytype() {
+      getsupplytype().then((res) => {
+        if (res.data.state == 1) {
+          this.sType = res.data.data.list;
+        }
+        console.log(res, "oo");
+      });
+    },
+
     toDelete(val, index) {
       delsupplys(val.ID)
         .then((res) => {
@@ -257,15 +234,15 @@ export default {
         });
     },
 
-   
-
     toAdd(val) {
       this.$refs.addSupply.show(1, val);
     },
     toClick(data, val) {
       this.$refs.addSupply.show(data, val);
     },
-    changeTypeName() {},
+    changeTypeName() {
+      this.initData();
+    },
     startTimeChange() {},
     endTimeChange() {},
     search() {},