Merge remote-tracking branch 'origin/master'

yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue

@@ -64,12 +64,101 @@
             <el-col :span="8">
               <el-form-item class="trightb_item">
                 <span>{{formobj.arrivalDate}}</span>
-                <!-- <el-date-picker v-model="formobj.arrivalDate" type="date" format="yyyy-MM-dd" style="width: 80%;"
-                  value-format="yyyy-MM-dd" placeholder="请选择" /> -->
               </el-form-item>
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">付款日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.paymentDate" type="date" style="width: 80%;" format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd" placeholder="请选择" />
+                <!-- <span>{{formobj.supplierName}}</span> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">付款金额</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <!-- <span>{{formobj.arrivalDate}}</span> -->
+                <el-input v-model="formobj.payment" placeholder="" @input="limitInput($event)" style="width: 80%;"
+                  clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">付款单位</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.payer" placeholder="" style="width: 80%;" clearable />
+                <!-- <span>{{formobj.supplierName}}</span> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">付款单位开户行</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <!-- <span>{{formobj.arrivalDate}}</span> -->
+                <el-input v-model="formobj.payerBank" placeholder="" style="width: 80%;" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">收款单位</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.payee" placeholder="" style="width: 80%;" clearable />
+                <!-- <span>{{formobj.supplierName}}</span> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">收款单位开户行</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <!-- <span>{{formobj.arrivalDate}}</span> -->
+                <el-input v-model="formobj.payeeBank" placeholder="" style="width: 80%;" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">备注</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.paymentSummary" placeholder="" type="textarea" :rows="5" style="width: 100%;"
+                  clearable />
+                <!-- <span>{{formobj.supplierName}}</span> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
           <el-collapse v-model="activeNames">
             <el-collapse-item name="1" title="商品信息">
               <!-- <template slot="title" title="商品信息">
@@ -113,11 +202,35 @@
           arrivalDate: "",
           supplierSid: "",
           supplierName: "",
+          paymentDate: "",
+          payment: "",
+          payer: "",
+          payerBank: "",
+          payee: "",
+          payeeBank: "",
+          paymentSummary: "",
           commodityList: [],
         }
       }
     },
     methods: {
+      /**
+       * 1、必须为数字
+       * 2、只能有一个小数点
+       * 3、小数点后保留两位小数
+       * 4、当第一位输入小数点的时候自动补全，补为 0.
+       * 5、除非是小数，否则数字不能以0开头
+       * @param {string} value - 输入的值
+       * @param {string} index - 匹配的对象属性 [mkPrice | slPrice]
+       */
+      limitInput(value) {
+        this.formobj.payment =
+          ("" + value) // 第一步：转成字符串
+          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
+          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
+          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
+          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
+      },
       submitData() {
         console.log(">>>>>>>>>submit", this.formobj)
 
@@ -156,6 +269,13 @@
           arrivalDate: "",
           supplierSid: "",
           supplierName: "",
+          paymentDate: "",
+          payment: "",
+          payer: "",
+          payerBank: "",
+          payee: "",
+          payeeBank: "",
+          paymentSummary: "",
           commodityList: [],
         }