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

src/xt_pages/supply/components/addSupply.vue

           </el-col>
           <el-col span="6">
             <el-form-item label="增值税税率" prop="vatRate">
-              <el-input v-model="supplier.vatRate"></el-input>
+              <el-input
+                v-model="supplier.vatRate"
+                @keyup.native="supplier.vatRate = oninput(supplier.vatRate)"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
+          <!-- id填写======================================================= -->
+          <el-table-column label="id" v-if="false">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.id" style="width: 80px"></el-input>
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
           <!-- 联系地址填写 -->
           <el-table-column label="联系地址" align="center" width="130px">
             <template slot-scope="scope">
               <el-form-item :prop="'contacts.' + scope.$index + '.name'">
                 <!-- :prop="'contacts.' + scope.$index + '.name'"  如需添加可在上方标签加入 -->
                 <el-select
-                  v-model="scope.row.isfirst"
+                  v-model="scope.row.is_first"
                   style="width: 90px"
                   placeholder="请选择"
                   @change="changeName($event, scope)"
   delcontactone,
   savesupply,
   updatesupply,
+  getexporthistory,
 } from "@/api/supply";
 import Template from "../../data/template.vue";
 export default {
       },
       tableData: [
         {
+          id: "",
           contacts: "",
           phone: "",
           address: "",
       supplier: {
         supplierName: "",
         supplierCode: "gsy001",
-        supplierType: "",
-        vatRate: "",
+        supplierType: 0,
+        vatRate: 0,
         number: "",
         bank: "",
         bankAccount: "",
         this.title = "新增供应商";
         this.dialogVisible = true;
       } else if (type == 2) {
+        // console.log(data,'oop')
         this.show_type = 2;
         this.supplier_ids = data.ID;
         this.title = "编辑供应商";
         this.dialogVisible = true;
       }
     },
+
+    oninput(num) {
+      var str = num;
+      var len1 = str.substr(0, 1);
+      var len2 = str.substr(1, 1);
+      //如果第一位是0，第二位不是点，就用数字把点替换掉
+      if (str.length > 1 && len1 == 0 && len2 != ".") {
+        str = str.substr(1, 1);
+      }
+      //第一位不能是.
+      if (len1 == ".") {
+        str = "";
+      }
+      //限制只能输入一个小数点
+      if (str.indexOf(".") != -1) {
+        var str_ = str.substr(str.indexOf(".") + 1);
+        if (str_.indexOf(".") != -1) {
+          str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
+        }
+      }
+      //正则替换
+      str = str.replace(/[^\d^\.]+/g, ""); // 保留数字和小数点
+      str = str.replace(/\.\d\d\d\d$/, ""); // 小数点后只能输两位
+      return str;
+    },
+
     closePop() {
       this.dialogVisible = false;
       this.supply_code = [];
           if (valid) {
             this.$refs[formName].validate((valid) => {
               if (valid) {
+                this.recordInfo.contacts.forEach((el) => {
+                  if (!el.phone) {
+                    el.phone = "";
+                  }
+                  if (!el.address) {
+                    el.address = "";
+                  }
+                  if (!el.id) {
+                    el.id = 0;
+                  }
+                });
                 let params = {
-                  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: "",
+                  suppliercode: this.supplier.supplierCode || "",
+                  suppliername: this.supplier.supplierName || "",
+                  suppliertype: this.supplier.supplierType || 0,
+                  vatrate: this.supplier.vatRate || 0,
+                  number: this.supplier.number || "",
+                  bank: this.supplier.bank || "",
+                  bankaccount: this.supplier.bankAccount || "",
                   contacts: [...this.recordInfo.contacts],
                 };
-                console.log(params, "dhas");
-                savesupply(params).then((res) => {});
+                savesupply(params).then((res) => {
+                  if (res.data.state == 1) {
+                    this.$message.success("修改成功");
+                    this.closePop();
+                    this.$emit("init");
+                  } else {
+                    this.$message.error("修改失败");
+                    setTimeout(() => {
+                      this.closePop();
+                    }, 2000);
+                  }
+                });
               } else {
                 return false;
               }
             });
-
-            this.dialogVisible = false;
           } else {
             return false;
           }
           if (valid) {
             this.$refs[formName].validate((valid) => {
               if (valid) {
+                this.recordInfo.contacts.forEach((el) => {
+                  if (!el.phone) {
+                    el.phone = "";
+                  }
+                  if (!el.address) {
+                    el.address = "";
+                  }
+                  if (!el.id) {
+                    el.id = 0;
+                  }
+                });
                 let params = {
-                  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: "",
+                  suppliercode: this.supplier.supplierCode || "",
+                  suppliername: this.supplier.supplierName || "",
+                  id: this.supplier.id|| 0,
+                  suppliertype: this.supplier.supplierType || "",
+                  vatrate: this.supplier.vatRate || 0,
+                  number: this.supplier.number || "",
+                  bank: this.supplier.bank || "",
+                  bankaccount: this.supplier.bankAccount || "",
                   contacts: [...this.recordInfo.contacts],
                 };
-                console.log(this.recordInfo, "dhas");
-                console.log(typeof this.supplier_ids, "oo");
+
                 updatesupply(params).then((res) => {
-                  console.log(res, "oo");
+                  if (res.data.state == 1) {
+                    this.$message.success("修改成功");
+                    this.closePop();
+                    this.$emit("init");
+                  } else {
+                    this.$message.error("修改失败");
+                    setTimeout(() => {
+                      this.closePop();
+                    }, 2000);
+                  }
                 });
               } else {
                 return false;
               }
             });
-
-            this.dialogVisible = false;
           } else {
             return false;
           }
       this.contactsinfo();
     },
 
-    // 首次打开新增页面判断是否有首要联系人
+    //  获取供应商与联系人  首次打开新增页面判断是否有首要联系人
     getcontacts(val) {
       let data = {
-        value: 0,
+        value: 1,
         label: "是",
       };
       getsupplyandcontactone({ id: val }).then((res) => {
           this.recordInfo.contacts = res.data.data.contact;
           if (this.recordInfo.contacts.length == 0) {
             this.recordInfo.contacts = [{}];
-            this.recordInfo.contacts[0].isfirst = data;
+            this.recordInfo.contacts[0].is_first = data.value;
           } else if (this.recordInfo.contacts.length == 1) {
             let val = res.data.data.contact[0];
-            this.recordInfo.contacts[0].isfirst = data;
+            this.recordInfo.contacts[0].is_first = data.value;
             this.recordInfo.contacts[0] = {
+              id: val.id,
               name: val.name,
               address: val.address,
               phone: val.phone,
-              isfirst: val.is_first,
             };
+            this.$forceUpdate();
           } else {
             this.recordInfo.contacts.forEach((o) => {
               if (o.isfirst == 0) {
-                this.tabList.label = "否";
               } else if (o.isfirst == 1) {
-                this.tabList.label = "是";
               }
             });
           }
       };
       let arr = [];
       if (this.recordInfo.contacts.length <= 1) {
-        this.recordInfo.contacts[0].isfirst = data2.value;
+        this.recordInfo.contacts[0].is_first = data2.value;
       } else {
         this.recordInfo.contacts.forEach((el, index) => {
-          console.log(scope.$index, index, "oo");
           if (scope.$index == index) {
-            el.isfirst = data;
+            el.is_first = data;
           } else {
-            el.isfirst = data1.value;
+            el.is_first = data1.value;
           }
-          arr.push(el.isfirst);
+          arr.push(el.is_first);
         });
         if (arr.includes(1)) {
           return;
         } else {
-          this.recordInfo.contacts[0].isfirst = data2.value;
+          this.recordInfo.contacts[0].is_first = data2.value;
         }
       }
     },
           if (
             i.contacts != "" &&
             i.phone != "" &&
+            i.id != "" &&
             i.address != "" &&
             i.FirstConcats != ""
           ) {
 /deep/ .el-form-item__error {
   // display: none !important;
 }
-</style>
+</style>

src/xt_pages/supply/components/purchaseOrderPrint.vue

               <div style="width: 100px">供应商签字：</div>
               <div style="width: 100px"><span></span></div>
             </div> -->
-            <div class="description">
-              <div class="content">折扣额：</div>
-              <div class="content">折扣金额：</div>
-              <div class="content">本次付款：</div>
-              <div class="content">本次欠款：</div>
-              <div class="content_1">备注：</div>
-              <div class="content">制单人：</div>
-              <div class="content">收货人签字：</div>
-              <div class="content">供应商签字：</div>
+          </div>
+          <div
+            style="
+              width: 100%;
+              display: flex;
+              flex: 1;
+              justify-content: flex-start;
+              flex-wrap: wrap;
+            "
+          >
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              供应商：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              折扣金额：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              本次付款：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              本次欠款：
+            </div>
+            <div
+              style="
+                width: 100%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              备注：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              制单人：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              收货人签字：
+            </div>
+            <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+              供应商签字：
             </div>
           </div>
+     
         </div>
       </div>
     </div>
     btnClickPrint: function () {
       let LODOP = getLodop(); //调用getLodop获取LODOP对象
       LODOP.PRINT_INIT("打印控件功能演示_Lodop功能_整页缩放打印输出");
-      
+
       LODOP.ADD_PRINT_BARCODE(15, 15, 300, 300, "QRCode", "xxxxxxxxxxxxx");
       LODOP.SET_PRINT_STYLEA(0, "Stretch", 1); //(可变形)扩展缩放模式
       LODOP.PREVIEW(); //预览(预览打印无脚标)
   flex-wrap: wrap;
   .content {
     width: 25%;
+    text-align: left;
+    margin-bottom: 1px;
+    font-size: 18px;
   }
   .content_1 {
     width: 100%;
+    text-align: left;
+    margin-bottom: 1px;
+    font-size: 18px;
   }
   // .content_2{
   //   width: 33%;

src/xt_pages/supply/supplyQuery.vue

             </el-option>
           </el-select>
 
+          <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"
             type="primary"
             icon="el-icon-search"
             @click="search"
-            >搜索</el-button
+            >查询</el-button
           >
         </div>
         <div>
           <el-button size="small" type="primary" @click="toAdd(1)"
             >新增</el-button
           >
-          <addSupply ref="addSupply"></addSupply>
+          <addSupply ref="addSupply" @init="initData"></addSupply>
         </div>
       </div>
 
         limit: this.limit,
         page: this.page,
         ctype: this.type_name,
+        keyword:this.keywords,
       };
       getexporthistory(params).then((res) => {
         if (res.data.state == 1) {
+          console.log(res.data.data.list, "res.data.data.list");
           this.tableList = res.data.data.list;
           this.total = res.data.data.total;
         }
     },
     startTimeChange() {},
     endTimeChange() {},
-    search() {},
+    search() {
+      this.initData();
+    },
     handleSizeChange(val) {
       this.limit = val;
       this.initData();