no message

src/api/business/crm/contract.js

@@ -11,7 +11,14 @@ export function listOrder(query) {
     params: query
   })
 }
-
+export function listOrder2(query) {
+  request.defaults.baseURL = '/ezhizao-yzbh-crm'
+  return request({
+    url: '/business/archive/order/list2',
+    method: 'get',
+    params: query
+  })
+}
 // 查询档案入库详细
 export function getOrder(id) {
   request.defaults.baseURL = '/ezhizao-yzbh-crm'

src/views/business/crm/order/form.vue

@@ -100,7 +100,8 @@
                     </el-icon>
                   </el-button> -->
                 </template>
-                <el-link  :underline="false"   type="primary" @click="handleInfo(form)" v-else>{{ form.companyName }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleInfo(form)" v-else>{{ form.companyName
+                  }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -241,6 +242,11 @@
                             <div>{{ rowNum(item.amount) }}</div>
                           </el-form-item>
                         </el-col>
+                        <el-col :span="4" style="padding-top: 18px">
+                          <el-form-item label="服务区间" v-if="item.timeVo != null && item.timeVo != undefined">
+                            <div>{{ item.timeVo.startTime.substr(0,item.timeVo.startTime.length - 3) }} ~ {{ item.timeVo.endTime.substr(0,item.timeVo.endTime.length - 3) }}</div>
+                          </el-form-item>
+                        </el-col>
                         <el-col :span="4" style="padding-top: 18px" v-if="item.taskTypeId ==4">
 
                         </el-col>
@@ -1081,6 +1087,12 @@
         proxy.$refs["orderRef"].validate((valid) => {
           if (valid && detailValid() && amountValid()) {
             const formValue = form.value;
+            // formValue.details.forEach(item => {
+            //   item.timeVo = null
+            // })
+
+
+
             formValue.details =
               form.value.serviceType === 1
                 ? loopDetails.value
@@ -1365,9 +1377,9 @@
             l.payAddress === 1 && l.addressStyle === 2 && l.addressAmount
               ? Number(l.addressAmount)
               : 0;
-              if(l.alterType ==="跨区变更" &&  l.addressStyle === 2 && l.addressAmount){
-                amount += Number(l.addressAmount)
-              }
+          if (l.alterType === "跨区变更" && l.addressStyle === 2 && l.addressAmount) {
+            amount += Number(l.addressAmount)
+          }
           l.processes.forEach((v) => {
             amount += v.amount ? Number(v.amount) : 0;
           });
@@ -1539,7 +1551,12 @@
     proxy.$modal
       .confirm("是否确认审核?")
       .then((_) => {
+
+        // form.value.details.forEach(item => {
+        //   item.timeVo = null
+        // })
         verifyCheckOrder(form.value).then((res) => {
+          console.log(123, res);
           if (res.data == null) {
             verifyUpload(1);
           } else {

src/views/business/deduction/index.vue

@@ -151,7 +151,17 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="凭证附件：" required>
-              <div class="details-btns-container" style="display: flex">
+              <dragUpload :accept="accept" style="width:100%" @file="upload"
+                v-if="form.files == null || form.files == ''" />
+              <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.files[0].fileUrl}`"
+                class="avatar" @click="openEvidience('files[0]')" />
+              <div v-if="form.status !== 3">
+                <el-icon :size="20" v-if="form.files !== '' ||form.files == null "
+                  @click="form.files = []" class="delete-button">
+                  <Delete />
+                </el-icon>
+              </div>
+              <!-- <div class="details-btns-container" style="display: flex">
                 <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
                   <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
                 </el-upload>
@@ -171,7 +181,7 @@
                     <el-button link size="small" type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
                   </template>
                 </el-table-column>
-              </el-table>
+              </el-table> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -254,7 +264,7 @@
   import FileDialog from "./fileDialog.vue";
   import HousingFundViewDialog from "./HousingFundViewDialog";
   import SocialSecurityViewDialog from "./SocialSecurityViewDialog";
-
+  import dragUpload from "@/components/dragUpload"
   // import DepositForm from "./form"
   const { proxy } = getCurrentInstance();
   /** 字典数组区 */
@@ -511,7 +521,7 @@
 
   function upload(param) {
     const formData = new FormData();
-    formData.append("file", param.file);
+    formData.append("file", param);
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};

src/views/business/invoice/ContractChoice.vue

@@ -35,6 +35,7 @@
                 <el-table-column type="index" label="序号" width="46" align="center" />
                 <el-table-column label="合同编号" prop="contractNo" width="100" align="center" />
                 <el-table-column label="客户名称" prop="companyName" width="200" align="center" />
+                <el-table-column label="签约时间" prop="formDate" width="200" align="center" />
                 <el-table-column label="备注" prop="remark" header-align="center" />
                 <el-table-column v-if="!multiple" label="操作" width="50" align="center">
                     <template #default="scope">
@@ -50,7 +51,7 @@
 </template>
 <script setup>
     import { toRef } from 'vue'
-    import { listOrder } from "@/api/business/crm/contract";
+    import { listOrder2 } from "@/api/business/crm/contract";
     const { proxy } = getCurrentInstance();
     const props = defineProps({
         width: {
@@ -158,7 +159,7 @@
         visible.value = false;
     }
     const getList = () => {
-        listOrder(queryParams.value)
+        listOrder2(queryParams.value)
             .then(res => {
                 total.value = res.total
                 list.value = res.rows

src/views/business/invoice/form.vue

@@ -33,7 +33,11 @@
                             <el-button v-show="!editStatus && form.status == 1" type="warning" size="small" icon="Back"
                                 @click="returnStatus" v-hasPermi="['business:invoice:return']">退回</el-button>
                         </div>
-
+	
+                        <div style="display: flex;">
+                            <el-button type="danger" size="small" icon="Position" v-show="form.status ==3"
+                                @click="changeStauts4" v-hasPermi="['business:invoice:reverseAudit']">反审核</el-button>
+                        </div>
 
                     </el-button-group>
                     <div class="screen-btn" @click="handleScreen">
@@ -541,6 +545,26 @@
             returnFlag.value = false
             getList.value()
         });
+    }
+
+    function changeStauts4() {
+        proxy.$modal
+            .confirm("您确认要反审核当前数据吗?")
+            .then(() => {
+                visible.value = true;
+                form.value.status = 0
+                updateInvoice(form.value).then(response => {
+                    proxy.$modal.msgSuccess("修改成功");
+                    visible.value = false;
+                    getList.value()
+                });
+            })
+            .catch(() => {
+                proxy.$modal.msg("已取消");
+            });
+
+
+
     }
     function changeStauts3() {
         console.log(form.value.refuseReason);