2023.11.14

public/hLive/js/video.js

@@ -2325,7 +2325,7 @@
 
           if (xhr.response) {
             body = xhr.response
-          } else if (xhr.responseType === "text" || !xhr.responseType) {
+          } else if (xhr. === "text" || !xhr.responseType) {
             body = xhr.responseText || xhr.responseXML
           }
 

src/views/zhpt/projectManager/mcpProject/designBudget/addBudget/inputPage.vue

@@ -273,7 +273,9 @@ export default {
       let materialData = null
       if (this.showMaterial && handleState == '1') {
         materialData = this.$refs.Tftransfer.submitData()
-        if (!materialData && saveState) return this.$message.error('请选择【材料信息】及数量')
+        if (this.$store.state.user.tenantId !== imConfig.companyFlowInfo.FP) {
+          if (!materialData && saveState) return this.$message.error('请选择【材料信息】及数量')
+        }
       }
       materialData = materialData || []
       // 预算信息

src/views/zhpt/projectManager/mcpProject/proDispatch/addDispatch/inputPage.vue

@@ -271,7 +271,9 @@ export default {
       })
       // console.log('有没有0', zero)
       if (zero) return this.$message.error('预算量不能为0')
-      if (this.showMaterial && !materialData.length) return
+      if (this.$store.state.user.tenantId !== Config.companyFlowInfo.FP) {
+        if (this.showMaterial && !materialData.length) return this.$message.error('请选择材料')
+      }
       const [formData] = this.getFormData1({
         isNode: true,
         extend: { saveState: save ? 0 : 1 },

src/views/zhpt/projectManager/newInstall/proSettlement/addSettle/detailPage.vue

@@ -433,6 +433,8 @@ export default {
                     allPrice += item.amountMoney
                   })
                   allPrice = allPrice.toFixed(2)
+                } else {
+                  allPrice = (this.str1 + this.str2 + this.str3 + this.str4).toFixed(2)
                 }
               } else {
                 if (this.settleArr2) {

src/views/zhpt/projectManager/pipeRepair/proDispatch/addDispatch/inputPage.vue

@@ -54,6 +54,7 @@ import { getProjList, getteampList } from '@/api/sys/pzSys.ts'
 import ProjectInfo from '@/views/zhpt/projectManager/newInstall/components/projectInfo.vue'
 import { InputMixin } from '@/views/zhpt/projectManager/newInstall/common/mixins'
 import { findStepDatamap } from '@/views/zhpt/projectManager/newInstall/common/config'
+import Config from '@/views/imConfig.js'
 const BUDGET_SERVICE_NAME = 'tfDesignBudgetWService'
 
 export default {
@@ -215,7 +216,9 @@ export default {
       })
       // console.log('有没有0', zero)
       if (zero) return this.$message.error('预算量不能为0')
-      if (this.showMaterial && !materialData.length && handleState == '1') return
+      if (this.$store.state.user.tenantId !== Config.companyFlowInfo.FP) {
+        if (this.showMaterial && !materialData.length && handleState == '1') return this.$message.error('请选择材料')
+      }
       const [formData] = this.getFormData1({
         isNode: true,
         extend: { saveState: save ? 0 : 1 },