Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/analysis/index.vue

@@ -199,7 +199,17 @@ watchEffect(() => {
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 />
-                <el-button size="small" type="primary" @click="select1?.blur">确认</el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="
+                    () => {
+                      select1?.blur();
+                      bulletinPrompt.date = 'ignore';
+                    }
+                  "
+                  >确认</el-button
+                >
               </div>
             </el-option>
           </el-select>
@@ -294,7 +304,17 @@ watchEffect(() => {
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
                     />
-                    <el-button size="small" type="primary" @click="select2?.blur">确认</el-button>
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="
+                        () => {
+                          select2?.blur();
+                          summaryPrompt.date = 'ignore';
+                        }
+                      "
+                      >确认</el-button
+                    >
                   </div>
                 </el-option>
               </el-select>
@@ -387,7 +407,17 @@ watchEffect(() => {
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
                     />
-                    <el-button size="small" type="primary" @click="select3?.blur">确认</el-button>
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="
+                        () => {
+                          select3?.blur();
+                          stagePrompt.date = 'ignore';
+                        }
+                      "
+                      >确认</el-button
+                    >
                   </div>
                 </el-option>
               </el-select>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/order/component/information.vue

@@ -190,7 +190,7 @@ const formItems = reactive([
     { label: '客户名称', key: 'customName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '商机名称', key: 'businessOpportunityName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '订单金额', key: 'price', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
-    { label: '回款状态', key: 'statusValue', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
+    { label: '回款状态', key: 'receivedStatus', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '已回款金额', key: 'receivedPayment', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '未回款', key: 'unReceivedPayment', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '订单类型', key: 'type', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
@@ -201,7 +201,7 @@ const formItems = reactive([
     { label: '创建人', key: 'creatorName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '创建时间', key: 'createTime', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '客户签约人', key: 'customSignerName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
-    { label: '公司签约人', key: 'customSignerName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
+    { label: '公司签约人', key: 'companySignerName', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '48%' },
     { label: '备注', key: 'remark', value: '', labelClass: 'w-[115px] text-right text-gray-500', width: '100%' },
 ])
 
@@ -209,8 +209,8 @@ watchEffect(() => {
     const { data } = props
     info.value = data
     formItems.forEach(item => {
-        if (item.key === 'statusValue') {
-            const status = info.value['status'];
+        if (item.key === 'receivedStatus') {
+            const status = info.value['receivedStatus'];
             item.value = status !== '' && status !== null ? (paymentStatus.find(p => p.value === status)?.label || '') : '';
         } else {
             item.value = info.value[item.key] || '';