no message

src/views/business/examine/index.vue

@@ -16,7 +16,7 @@
                     <el-option label="已拒绝" :value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="公司名称">
+            <el-form-item label="公司名称：">
                 <el-input size="small" v-model="queryParams.companyName" placeholder="请输入公司名称" style="width: 150px"
                     clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -24,8 +24,8 @@
                 <el-date-picker v-model="queryParams.currentPeriod" style="width: 150px" type="month" format="YYYY年MM月"
                     value-format="YYYY-MM" size="small" />
             </el-form-item>
-            <el-form-item label="委托来源：" prop="entrustCome">
-                <el-input size="small" v-model="queryParams.entrustCome" style="width: 150px" placeholder="请输入委托来源"
+            <el-form-item label="委托来源：" prop="entrustComeName">
+                <el-input size="small" v-model="queryParams.entrustComeName" style="width: 150px" placeholder="请输入委托来源"
                     clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item prop="dateFilter" label="到账时间：">
@@ -243,6 +243,9 @@
 
     /** 导出按钮操作 */
     function handleExport() {
+            console.log(queryParams.value);
+            
+        
         proxy.download('business/examine/export', {
             ...queryParams.value
         }, `examine_${new Date().getTime()}.xlsx`)

src/views/business/housingFund/declare/view.vue

@@ -155,6 +155,18 @@
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <history ref="fromDialog" :currentMember=currentMember></history>
+    <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+    :close-on-click-modal="false">
+    <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+      <el-input v-model="form.refuseReason" type="textarea" placeholder="请输入取消理由" />
+    </el-form-item>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+        <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
   </el-dialog>
 </template>
 <script setup>
@@ -175,6 +187,7 @@
   const selections = ref([]);
   const currentSource = ref(null);
   const editStatus = ref(false);
+  const returnFlag = ref(false);
   const canSave = ref(false);
   const loading = ref(false);
   const tenantMyself = useUserStore().user;
@@ -317,6 +330,10 @@
     reset();
   }
   function turnBack(detail) {
+    returnFlag.value = true;
+   
+  }
+  function submitForm(){
     loading.value = true
     form.value.status = 1;
 
@@ -331,6 +348,7 @@
       }).finally(() => {
         loading.value = false
         visible.value = false;
+        returnFlag.value = false;
       });
   }
   function reset() {

src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -104,14 +104,26 @@
           </el-button>
           <el-button v-hasPermi="['business:individualIncomeTaxDetail:deductionTurnBack']" icon="back" type="warning"
             size="small" style="float: right;"
-            v-show="(toTenantId() == emptyForm?.entrust?.toTenantId || tenantMyself.tenantId == 0)"
+            v-show="(toTenantId == emptyForm?.entrust?.toTenantId || tenantMyself.tenantId == 0)"
             :disabled="(emptyForm == null || emptyForm.status !== 3)  " @click="turnBack(emptyForm)">
             退回
           </el-button>
         </div>
       </div>
     </div>
-    <history ref="fromDialog"  :currentMember=currentMember></history>
+    <history ref="fromDialog" :currentMember=currentMember></history>
+    <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+      :close-on-click-modal="false">
+      <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+        <el-input v-model="emptyForm.refuseReason" type="textarea" placeholder="请输入取消理由" />
+      </el-form-item>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+          <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </el-dialog>
 </template>
 
@@ -154,6 +166,7 @@
   const districts = ref([]);
   const fileList = ref([]);
   const reportFiles = ref([]);
+  const returnFlag = ref(false);
   const sourceCategories = ref([]);
   const tenantId = ref(0);
   const addType = ref(1);
@@ -292,8 +305,20 @@
       }
     }
   }
+
+
   /** 退回按钮操作 */
   function turnBack(row) {
+    returnFlag.value = true;
+
+  }
+
+  function submitForm() {
+
+    if (emptyForm.value.refuseReason == null) {
+      proxy.$modal.msgError("请填写退回原因");
+      return
+    }
     loading.value = true
     emptyForm.value.status = 1;
     // emptyForm.value.workOrderId = workOrderId;
@@ -304,7 +329,22 @@
     loading.value = false;
     getList.value();
     visible.value = false;
+    returnFlag.value = false;
   }
+
+  // /** 退回按钮操作 */
+  // function turnBack(row) {
+  //   loading.value = true
+  //   emptyForm.value.status = 1;
+  //   // emptyForm.value.workOrderId = workOrderId;
+  //   emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
+  //   emptyForm.value.month = proxy.moment(currentMonth.value).format("MM");
+  //   console.log(emptyForm);
+  //   updateIndividualIncomeTaxDetail(emptyForm.value);
+  //   loading.value = false;
+  //   getList.value();
+  //   visible.value = false;
+  // }
   function changeMonthHandle(parentId) {
     isView.value = true
     const nowDate = ref(

src/views/business/production/IndividualIncomeTaxIsZero/FormDialog.vue

@@ -69,7 +69,19 @@
         </el-button>
       </div>
     </div>
-    <history ref="fromDialog"  :currentMember=currentMember></history>
+    <history ref="fromDialog" :currentMember=currentMember></history>
+    <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+      :close-on-click-modal="false">
+      <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+        <el-input v-model="emptyForm.refuseReason" type="textarea" placeholder="请输入取消理由" />
+      </el-form-item>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+          <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </el-dialog>
 </template>
 <script setup>
@@ -108,6 +120,7 @@
   const year = ref({});
   const month = ref({});
   const cities = ref([]);
+  const returnFlag = ref(false);
   const toTenantId = ref([])
   const districts = ref([]);
   const fileList = ref([]);
@@ -208,17 +221,29 @@
 
   /** 退回按钮操作 */
   function turnBack(row) {
+    returnFlag.value = true;
+
+  }
+  function submitForm() {
+    
+    if (emptyForm.value.refuseReason == null) {
+      proxy.$modal.msgError("请填写退回原因");
+      return
+    }
     loading.value = true
     emptyForm.value.status = 1;
     emptyForm.value.workOrderId = workOrderId;
     emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
     emptyForm.value.month = proxy.moment(currentMonth.value).format("MM");
-    console.log(emptyForm.value);
     updateIndividualIncomeTaxDetail(emptyForm.value);
     loading.value = false;
     getList.value();
     visible.value = false;
+    returnFlag.value = false;
   }
+
+
+
   function getInfoId(id) {
     getInfo(mainInfo.value.id, monthInfo.value.year, monthInfo.value.month).then((response) => {
       console.log("response", response);

src/views/business/production/financialReportTax/FormDialog.vue

@@ -263,6 +263,18 @@
     </div>
 
     <history ref="fromDialog" :currentMember=currentMember></history>
+    <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+    :close-on-click-modal="false">
+    <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+      <el-input v-model="emptyForm.refuseReason" type="textarea" placeholder="请输入取消理由" />
+    </el-form-item>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+        <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
   </el-dialog>
 </template>
 
@@ -305,6 +317,7 @@
   const reportFiles = ref([]);
   const tenantId = ref(0);
   const toTenantId = ref([])
+  const returnFlag = ref(false);
   const currentMonth = ref(
     proxy.moment().subtract(1, "month").format("YYYY-MM-01")
   );
@@ -449,6 +462,12 @@
   }
   /** 退回按钮操作 */
   function turnBack(detail) {
+ 
+    returnFlag.value = true;
+   
+  }
+
+  function submitForm(){
     loading.value = true
     emptyForm.value.status = 1;
     emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
@@ -465,6 +484,8 @@
     getList.value();
     loading.value = false;
     visible.value = false;
+    returnFlag.value = false;
+   
   }
   /** 计算税额 */
   function taxChangeHandler() {

src/views/business/production/financialReportTaxIsZero/FormDialog.vue

@@ -105,7 +105,18 @@
       </div>
     </div>
   </el-dialog>
-
+  <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+    :close-on-click-modal="false">
+    <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+      <el-input v-model="emptyForm.refuseReason" type="textarea" placeholder="请输入取消理由" />
+    </el-form-item>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+        <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
   <history ref="fromDialog" :currentMember=currentMember></history>
 </template>
 
@@ -136,6 +147,7 @@
   const addDetailNum = ref(1);
   const isAdd = ref(false);
   const isView = ref(false);
+  const returnFlag = ref(false);
   const mainInfo = ref({});
   const monthInfo = ref({});
   const currentMember = ref({});
@@ -226,7 +238,7 @@
 
 
   function getHistory() {
-    proxy.$refs.fromDialog.open( mainInfo.value.companyId);
+    proxy.$refs.fromDialog.open(mainInfo.value.companyId);
   }
 
   function getTaxId(mainRow, id) {
@@ -281,6 +293,16 @@
 
   /** 退回按钮操作 */
   function turnBack(detail) {
+
+    returnFlag.value = true;
+  }
+
+  function submitForm() {
+        
+    if (emptyForm.value.refuseReason == null) {
+      proxy.$modal.msgError("请填写退回原因");
+      return
+    }
     loading.value = true
     emptyForm.value.status = 1;
     emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
@@ -295,8 +317,13 @@
       });
     getList.value();
     loading.value = false;
+    returnFlag.value = false;
     visible.value = false;
   }
+
+
+
+
   function openEvidience() {
     window.open(`${baseUrl}${emptyForm.value.evidenceFile}`);
   }

src/views/business/socialSecurity/declare/view.vue

@@ -362,6 +362,18 @@
     <print-dialog ref="printDialog" :parent="this" /> -->
   </el-dialog>
   <history ref="fromDialog" :currentMember=currentMember></history>
+  <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
+    :close-on-click-modal="false">
+    <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">
+      <el-input v-model="form.refuseReason" type="textarea" placeholder="请输入取消理由" />
+    </el-form-item>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+        <el-button icon="close" size="small" @click="returnFlag = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 <script setup>
   import {
@@ -385,6 +397,7 @@
   const toTenantId = ref([])
   const editStatus = ref(false);
   const canSave = ref(false);
+  const returnFlag = ref(false);
   const loading = ref(false);
   const currentMonth = ref(
 
@@ -659,6 +672,16 @@
       });
   }
   function turnBack(detail) {
+
+    returnFlag.value = true;
+
+   
+  }
+  function submitForm(){
+    if (form.value.refuseReason == null) {
+      proxy.$modal.msgError("请填写退回原因");
+      return
+    }
     loading.value = true
     form.value.status = 1;
 
@@ -673,6 +696,7 @@
       }).finally(() => {
         loading.value = false
         visible.value = false;
+        returnFlag.value = false;
       });
   }
   function passwordCheckHandler(value, field) {