Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -48,21 +48,13 @@
         />
       </div>
 
-      <div class="form">
+      <div class="form" style="width: 380px">
         <span class="formSpan">开票状态：</span>
-        <el-select
-          v-model="queryParams.flowStatus"
-          placeholder="请选择开票状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.INVOICE_OUT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        <el-checkbox-group v-model="type" :min="1" :max="3">
+          <el-checkbox v-for="item in typeOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
       </div>
 
       <div class="form" style="width: 380px">
@@ -238,6 +230,21 @@ import download from '@/utils/download'
 
 defineOptions({ name: 'KpglPage' })
 
+const type: any = ref(['101', '102'])
+const typeOptions = [
+  {
+    value: '101',
+    label: '已回款'
+  },
+  {
+    value: '102',
+    label: '已开票'
+  },
+  {
+    value: '105',
+    label: '开票中'
+  }
+]
 const invoiceTime = ref([])
 const returnTime = ref([])
 const queryParams = reactive({

zjugis-business/src/main/java/com/zjugis/business/flow/contractinvoice/event/ContractInvoiceEvent.java

@@ -121,7 +121,7 @@ public class ContractInvoiceEvent extends BaseController {
             if (!Objects.isNull(activityInstance) && activityInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 ContractInvoice entity = contractInvoiceService.selectByInstanceId(flowInstanceId);
-                entity.setFlowStatus(ContractInvoiceConstants.INVOICE_ACTIVITY_FINISH);
+                entity.setFlowStatus(ContractInvoiceConstants.INVOICE_FINISH);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 flowContractInvoiceService.updateById(entity);
             }
@@ -147,7 +147,6 @@ public class ContractInvoiceEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 ContractInvoice entity = contractInvoiceService.selectByInstanceId(flowInstanceId);
-                entity.setFlowStatus(ContractInvoiceConstants.INVOICE_FINISH);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 flowContractInvoiceService.updateById(entity);
                 projectService.calcProject(entity.getProjectId());

zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -207,7 +207,7 @@
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
         }
         if (!(!isTimes[i].bz1 || isTimes[i].bz1.trim() === '')) {
-            z.ui.input("[name='CommonCostDetailDO[" + i + "]$remark']").setValue(isTimes[i].bz1);
+            z.ui.input("[name='CommonCostDetailDO[" + i + "]$bz1']").setValue(isTimes[i].bz1);
         }
         if (!(!isTimes[i].commonCostId || isTimes[i].commonCostId.trim() === '')) {
             $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/FlowProject/js/apply.js

@@ -87,6 +87,7 @@
       all({ success: false });
       return;
     }
+    var milestoneFlag = false;
     var milestoneList = new Array()
     for (let key of Object.keys(postData)) {
       let mealName = postData[key];
@@ -94,9 +95,13 @@
         mealName.projectId = projectId;
         mealName.state = 0;
         milestoneList.push(z.ui.form.childStringify(mealName));
-
+        milestoneFlag  =true;
       }
     }
+    if(istransfer && !milestoneFlag){
+      all({success: false, errorMsg: "请填写项目里程碑!"});
+      return;
+    }
     postData.milestoneList = milestoneList;
     z.ui.ajax({
       url: z.ui.comm.getEntranceUrl("/flow/project/update"),