Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-web into dev

@@ -379,7 +379,7 @@
     >
       <a-spin :spinning="confirmLoading"  v-if="roleCode ==='pur'">
         <j-form-container>
-          <a-form-model ref="form" :model="modelfp" :rules="validatorRules2" slot="detail">
+          <a-form-model ref="form" :model="modelfp" :rules="validatorRulesfp" slot="detail">
             <a-row>
               <a-col :span="12">
                 <a-form-model-item label="发票号码" :labelCol="labelCol" :wrapperCol="wrapperCol"
@@ -467,7 +467,7 @@
 
       <a-spin :spinning="confirmLoading" v-if="roleCode ==='pur'">
         <j-form-container>
-          <a-form-model ref="form" :model="modelpay" :rules="validatorRules2" slot="detail">
+          <a-form-model ref="form" :model="modelpay" :rules="validatorRulesPay" slot="detail">
             <a-row>
               <a-col :span="12">
                 <a-form-model-item label="供应商（TEL）" :labelCol="labelCol" :wrapperCol="wrapperCol"
@@ -600,7 +600,7 @@
     >
       <a-spin :spinning="confirmLoading">
         <j-form-container>
-          <a-form-model ref="form" :model="modelpj" :rules="validatorRules2" slot="detail">
+          <a-form-model ref="form" :model="modelpj" :rules="validatorRules3" slot="detail">
             <a-row>
               <a-col :span="12">
                 <a-form-model-item label="供应商（TEL）" :labelCol="labelCol" :wrapperCol="wrapperCol"
@@ -727,12 +727,101 @@ export default {
       validatorRules: {
         supplier: [{ required: true, message: '请输入供应商（TEL）', trigger: 'blur' }],
         procurementChannels: [{ required: true, message: '请输入采购渠道', trigger: 'blur' }],
-        purchaseQuantity: [{ required: true, message: '请输入数量', trigger: 'blur' }],
-        unitPrice: [{ required: true, message: '请输入单价（不含税，元）', trigger: 'blur' }],
-        taxRate: [{ required: true, message: '请输入税率（%）', trigger: 'blur' }],
-        amount: [{ required: true, message: '请输入金额（元）', trigger: 'blur' }]
+        purchaseQuantity: [
+          { required: true, message: '请输入数量', trigger: 'blur' },
+          { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }  // 只能输入整数
+        ],
+        unitPrice: [
+          { required: true, message: '请输入单价（不含税，元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '单价必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ],
+        taxRate: [
+          { required: true, message: '请输入税率（%）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '税率必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ],
+        amount: [
+          { required: true, message: '请输入金额（元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ]
+      }
+      ,
+      validatorRules2: {
+        supplier: [{ required: true, message: '请输入供应商（TEL）', trigger: 'blur' }],
+        procurementChannels: [{ required: true, message: '请输入采购渠道', trigger: 'blur' }],
+        purchaseQuantity: [
+          { required: true, message: '请输入数量', trigger: 'blur' },
+          { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }  // 只能输入整数
+        ],
+        unitPrice: [
+          { required: true, message: '请输入单价（不含税，元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '单价必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ],
+        taxRate: [
+          { required: true, message: '请输入税率（%）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '税率必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ],
+        amount: [
+          { required: true, message: '请输入金额（元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }  // 可输入整数或小数
+        ],
+        hth: [{ required: true, message: '请输入合同/订单号', trigger: 'blur' }],
+        wldh: [{ required: true, message: '请输入物流单号', trigger: 'blur' }],
+        yrkNum: [
+          { required: true, message: '请输入已入库数量', trigger: 'blur' },
+          { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }
+        ],
+        wrkNum: [
+          { required: true, message: '请输入剩余订单未入库数量', trigger: 'blur' },
+          { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }
+        ],
+        rkNum: [
+          { required: true, message: '请输入已入库数量', trigger: 'blur' },
+          { pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }
+        ],
+        estimatedTime: [{ required: true, message: '请输入预计到厂时间', trigger: 'blur' }],
+        htfj: [{ required: true, message: '请上传合同附件', trigger: 'blur' }],
+
+      },
+      validatorRules3: {
+        supplier: [{ required: true, message: '请输入供应商（TEL）', trigger: 'blur' }],
+        hth: [{ required: true, message: '请输入合同/订单号', trigger: 'blur' }],
+        thhPj: [{ required: true, message: '请选择退换货评级等级', trigger: 'blur' }],
+        gysPj: [{ required: true, message: '请选择供应商评级等级', trigger: 'blur' }],
+      },
+        fphm: [{ required: true, message: '请输入供应商（TEL）', trigger: 'blur' }],
+
+      validatorRulesfp: {
+        fphm: [{ required: true, message: '请输入发票号码', trigger: 'blur' }],
+        fpje: [
+          { required: true, message: '请输入发票金额', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }
+        ],
+        fpqe: [
+          { required: true, message: '请输入发票欠额', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }
+        ],
+        fj: [{ required: true, message: '请上传发票', trigger: 'blur' }],
+        bz: [{ required: true, message: '请输入备注', trigger: 'blur' }],
+
+      },
+      validatorRulesPay:{
+        supplier: [{ required: true, message: '请输入供应商（TEL）', trigger: 'blur' }],
+        hth: [{ required: true, message: '请输入合同号/订单号', trigger: 'blur' }],
+        htje: [
+          { required: true, message: '请输入合同金额（元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }
+        ],
+        wfje: [
+          { required: true, message: '请输入未付金额（元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }
+        ],
+        fkfs: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
+        fsje: [
+          { required: true, message: '请输入付款金额（元）', trigger: 'blur' },
+          { pattern: /^\d+(\.\d+)?$/, message: '金额必须为数字（可包含小数）', trigger: 'blur' }
+        ],
+        fksj: [{ required: true, message: '请选择付款时间', trigger: 'blur' }],
       },
-      validatorRules2: {},
       dataSource2: [],
       dataSource3: [],
       dataSource4: [],
@@ -1197,16 +1286,19 @@ export default {
       this.visiblePj = false
     },
     handleConfirmpj(){
-      postAction(this.url.cmAudit, this.modelpj).then(res => {
-        if (res.success) {
-          this.$message.success('操作成功')
-          this.getCgInfo(this.model.wlbh)
-          this.visiblePj = false
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-      this.visiblePj = false
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.confirmLoading = true
+          postAction(this.url.cmAudit, this.modelpj).then(res => {
+            if (res.success) {
+              this.$message.success('操作成功')
+              this.getCgInfo(this.model.wlbh)
+              this.visiblePj = false
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+        }})
     },
     payreset() {
       this.visiblepay = false
@@ -1222,16 +1314,24 @@ export default {
     addpay() {
       var cmid = this.modelpay.cmId
       this.modelpay.status = 0
-      postAction(this.url.addpay, this.modelpay).then(res => {
-        if (res.success) {
-          this.modelpay = {}
-          this.modelpay.cmId = cmid
-          this.$message.success('操作成功')
-          this.paylist(this.modelpay.cmId)
-        } else {
-          this.$message.error(res.message)
-        }
-      })
+
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.confirmLoading = true
+          postAction(this.url.addpay, this.modelpay).then(res => {
+            if (res.success) {
+              this.modelpay.wfje = ''
+              this.modelpay.fsje = ''
+              this.modelpay.fksj = ''
+              this.modelpay.cmId = cmid
+              this.$message.success('操作成功')
+              this.paylist(this.modelpay.cmId)
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          this.confirmLoading = false
+        }})
     },
     blpInfo(record){
       this.visibleBlp = true
@@ -1263,16 +1363,21 @@ export default {
     //新增按钮，新增发票信息
     addfp() {
       var cmid = this.modelfp.cmId
-      postAction(this.url.addfp, this.modelfp).then(res => {
-        if (res.success) {
-          this.modelfp = {}
-          this.modelfp.cmId = cmid
-          this.$message.success('操作成功')
-          this.fplist(this.modelfp.cmId)
-        } else {
-          this.$message.error(res.message)
-        }
-      })
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.confirmLoading = true
+          postAction(this.url.addfp, this.modelfp).then(res => {
+            if (res.success) {
+              this.modelfp = {}
+              this.modelfp.cmId = cmid
+              this.$message.success('操作成功')
+              this.confirmLoading = false
+              this.fplist(this.modelfp.cmId)
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+        }})
     },
     //打开发票管理
     fpInfo(record) {
@@ -1335,7 +1440,12 @@ export default {
       getAction(this.url.queryById,{
         id: record.id
       }).then(res => {
+
+        console.log("res.result",res.result)
         this.model2 = res.result
+        if (!res.result.yrkNum){
+          this.model2.yrkNum = 0
+        }
       })
 
 
@@ -1433,6 +1543,8 @@ export default {
           //新增采买申请
           postAction(this.url.add, this.model).then(res => {
             if (res.success) {
+              this.confirmLoading = false
+              this.visible = false
               this.$message.success('操作成功！')
               this.getCgInfo(this.model.wlbh)
             } else {
@@ -1446,8 +1558,7 @@ export default {
       })
 
 
-      this.confirmLoading = false
-      this.visible = false
+
     },
 
     handleConfirmOk(status) {
@@ -1486,9 +1597,10 @@ export default {
           if (this.bjflag){
             url = this.url.edit
           }
-
           postAction(url, this.model2).then(res => {
             if (res.success) {
+              this.confirmLoading = false
+              this.visibleCm = false
               this.$message.success('操作成功')
               this.getCgInfo(this.model.wlbh)
             } else {
@@ -1502,8 +1614,7 @@ export default {
       })
 
 
-      this.confirmLoading = false
-      this.visibleCm = false
+
     },
     handleCancelCm() {
       this.visibleCm = false