提交相关代码

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formItem.vue

@@ -50,7 +50,7 @@
       is-link
       :class="element.options?.rules?.required ? '' : 'resetStyles'"
     >
-      <template #input v-if="element.options.defaultValue || element.options.defaultValue == 0">
+      <template #input v-if="element.options.defaultValue || element.options.defaultValue === '0' || element.options.defaultValue === 0">
         {{ selectedLabel }}
       </template>
     </van-field>
@@ -212,6 +212,7 @@ function selectChange(value, label) {
   showSelect.value = false;
   value && errorMessageForResettingTheCurrentOption();
   const cascade = relatedField[props.element.model];
+  console.log(cascade, '<=== cascade')
   if (cascade) {
     emit("cascadeProcessing", cascade);
   }

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formView.vue

@@ -10,7 +10,7 @@
 import { ref, reactive, toRefs, watch, nextTick, onMounted } from "vue";
 import requests from "@common/requests";
 import FormItem from "./formItem.vue";
-import { resetListData, itemFormSetValue } from "./formCorrespondenceProcessing"
+import { resetListData, itemFormSetValue, relatedField } from "./formCorrespondenceProcessing"
 
 const list = ref([]);
 const formRef = ref(null);
@@ -32,6 +32,15 @@ watch(() => props.formJson, (newValue) => {
 
 watch(() => props.formValue, (newValue) => {
   list.value = itemFormSetValue(props.formJson.list, newValue);
+  const fileds = Object.keys(newValue);
+  setTimeout(() => {
+    fileds.forEach(item => {
+      const cascade = relatedField[item];
+      if (cascade) {
+        cascadeProcessing(cascade)
+      }
+    });
+  }, 800)
 });
 
 function getJsonData() {

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue

@@ -315,7 +315,13 @@ function confirmTransfer() {
   }
   const { id } = excessiveData.value
   const { value } = dialogSelection.value
-  requests.post(queryParameters?.value.transferInterface, { ids: id, inchargerId: value }).then((res) => {
+  let formVal = {}
+  if(queryParameters?.value.key == 'contacts') {
+    formVal = { id, inchargerId: value, ownerId: value }
+  } else {
+    formVal = { ids: id, inchargerId: value, }
+  }
+  requests.post(queryParameters?.value.transferInterface, { ...formVal }).then((res) => {
     toastSuccess('转移成功')
     onRefresh(true)
     showDialog.value = false

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/business/addEditor.vue

@@ -137,12 +137,10 @@ useLifecycle({
   load: () => {
     formVal.value = props.formValue
     getBusinessOpportunityDetails(formVal.value)
-    console.log(formVal.value, '<==== formVal.value')
   },
   init: () => {
     formVal.value = props.formValue
     getBusinessOpportunityDetails(formVal.value)
-    console.log(formVal.value, '<==== formVal.value')
   }
 });
 

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -158,7 +158,7 @@
                     </el-table-column>
                     <el-table-column prop="finalChargeStatusText" label="文件审核状态" width="210" sortable v-if="user.timeType.taskFileCharge == 1 && [0, 1, 2].includes(idx)">
                         <template slot-scope="scope">
-                            <template v-if="scope.row.finalChargeStatus != 2">
+                            <template v-if="scope.row.fileChargeStatus != 2">
                                 <el-link :type="{'0': 'warning', '1': 'info', '2': 'danger'}[scope.row.fileChargeStatus]" :underline="false">
                                     {{ scope.row.finalChargeStatusTextList[0] || '' }}
                                     <template v-if="(scope.row.finalChargeStatusTextList || []).length > 1">