2023.10.27

package.json

@@ -101,4 +101,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

src/views/zhpt/projectManager/IndoorRenovation/components/printPdfSell.vue

@@ -181,7 +181,7 @@ export default {
     this.listData[1].je = sj
     this.listData[2].je = jl
     this.zz = zz
-    this.totalAll = Number(az + sj + jl)
+    this.totalAll = Number(az + sj + jl).toFixed(2)
   },
   methods: {
     // handleClick(tab, event) {

src/views/zhpt/projectManager/IndoorRenovation/projRecieveMaterial/addProject/detailPage.vue

@@ -128,7 +128,7 @@ export default {
       if (this.restOfMaterials && this.savedData && this.savedData.id) {
         this.warehouseName = this.savedData.condition
         const tempData = this.restOfMaterials
-        this.dataList.disTableList.dataTime = this.savedData.dataTime
+        this.dataList.disTableList.dataTime = this.savedData.dataTime.split(' ')[0]
         this.dataList.disTableList.staffIdName = this.savedData.staffIdName
         this.dataList.disTableList.handleUserName = this.savedData.handleUserName
         for (let i = 0; i < tempData.length; i++) {

src/views/zhpt/projectManager/newInstall/proSettlement/userSettle/inputPage.vue

@@ -858,6 +858,7 @@ export default {
               this.moneyObj.receivable = price
               this.dataList.disTableList.az = price
               this.dataList.disTableList.dx = this.daxie
+              this.dataList.disTableList.zz = price
             } else {
               this.moneyObj.receivable = (this.moneyObj.receivable - this.moneyObj.waterElectricity).toFixed(2)
               price = this.moneyObj.receivable
@@ -959,7 +960,7 @@ export default {
         }
       }
       if (this.shouTuiShow) {
-        console.log('缴费指南', this.ruleFormList.form3, this.ruleFormList.form3.ruleForm.confirmPayment)
+        // console.log('缴费指南', this.ruleFormList.form3, this.ruleFormList.form3.ruleForm.confirmPayment)
         if (this.ruleFormList.form3 && this.ruleFormList.form3.ruleForm.confirmPayment != '1' && value == 1) {
           this.$message.error('请确认是否缴费')
           return false
@@ -986,9 +987,9 @@ export default {
      * 提交数据
      */
     sureData() {
-      if (!this.validateData()) {
-        return
-      }
+      // if (!this.validateData()) {
+      //   return
+      // }
       const data = this.getFormData(1)
       if (!data) {
         return

src/views/zhpt/projectManager/newInstall/recieveMaterial/addProject/detailPage.vue

@@ -134,7 +134,7 @@ export default {
       if (this.restOfMaterials && this.savedData && this.savedData.id) {
         this.warehouseName = this.savedData.condition
         // console.log('材料时间', this.savedData)
-        this.dataList.disTableList.dataTime = this.savedData.dataTime
+        this.dataList.disTableList.dataTime = this.savedData.dataTime.split(' ')[0]
         this.dataList.disTableList.staffIdName = this.savedData.staffIdName
         this.dataList.disTableList.handleUserName = this.savedData.handleUserName
         const tempData = this.restOfMaterials