ezhizao_zx 1 سال پیش
والد
کامیت
669eed2adf

+ 1 - 1
src/views/business/crm/company/form.vue

@@ -130,7 +130,7 @@
                         v-model.trim="form.code"
                         size="small"
                         type="text"
-                        style="width: 82%"
+                        style="width: 100%"
                         placeholder="客户编码"
                         :clearable="true"
                       />

+ 7 - 0
src/views/business/entrust/deductOfFactory/index.vue

@@ -90,6 +90,9 @@
         align="center"
         width="100"
       >
+        <template #default="scope">
+          <span>{{ rowNum(scope.row.depositAmount) }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="结余金额"
@@ -97,6 +100,9 @@
         align="center"
         width="100"
       >
+        <template #default="scope">
+          <span>{{ rowNum(scope.row.remainAmount) }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="备注" prop="remark" align="center">
       </el-table-column>
@@ -126,6 +132,7 @@ import {
   confirmEntrustOrder,
   finishedEntrustOrder,
 } from "@/api/business/entrust/entrustOrder";
+import { rowNum } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
 import entrustOrderForm from "./form";
 const { proxy } = getCurrentInstance();

+ 6 - 1
src/views/business/entrust/depositOfFactory/index.vue

@@ -68,7 +68,11 @@
         prop="signingSubject"
         width="120"
       />
-      <el-table-column label="金额" align="center" prop="amount" width="120" />
+      <el-table-column label="金额" align="center" prop="amount" width="120">
+        <template #default="scope">
+          <span>{{ rowNum(scope.row.amount) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="附件" align="center" prop="files">
         <template #default="scope">
           <el-button
@@ -291,6 +295,7 @@ import {
 // import ElImageViewer from 'element-plus/lib/components/image-viewer';
 import freeAmountDialog from "./freeAmountDialog.vue";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { listCompany } from "@/api/business/crm/company";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";

+ 3 - 2
src/views/business/entrust/workOrder/initMonthDialog.vue

@@ -51,7 +51,7 @@ const props = defineProps({
   },
 });
 
-const { getList } = toRefs(props);
+const { getList, setCurrentMonth } = toRefs(props);
 const currentMonth = ref(proxy.moment().format("YYYY-MM-01"));
 
 const formOpen = ref(false);
@@ -68,8 +68,9 @@ function submitForm() {
   }).then((response) => {
     proxy.$modal.msgSuccess("设置完成!");
     formOpen.value = false;
-    setCurrentMonth(proxy.moment().format("YYYY-MM-01"));
+    setCurrentMonth.value(proxy.moment().format("YYYY-MM-01"));
     cancel();
+    // location.reload();
     getList.value();
   });
 }

+ 2 - 9
src/views/business/financial/collection/form.vue

@@ -36,15 +36,6 @@
             @click="editStatus = false"
             >取消修改</el-button
           >
-          <!-- <el-button v-if="form.id" type="success" size="small" @click="getForm">
-              <i class="fa fa-refresh" aria-hidden="true" /> 刷新
-            </el-button> -->
-          <!-- <el-button v-if="form.id && !editStatus && form.verifyStatus == 0"
-              v-hasPermi="['business:archive:order:verify']" type="warning" size="small"
-              @click="verifyHandler">审核通过</el-button>
-            <el-button v-if="form.id && !editStatus && form.verifyStatus == 0"
-              v-hasPermi="['business:archive:order:verify']" type="danger" size="small"
-              @click="rejectHandler">驳回</el-button> -->
           <el-button
             v-show="form.id && !editStatus && form.verifyDate == null"
             v-hasPermi="['business:collection:verify']"
@@ -459,6 +450,7 @@
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-form-item label="审核状态">
           <el-select
+            style="width: 100%"
             v-model.trim="form.status"
             placeholder="请选择"
             size="small"
@@ -473,6 +465,7 @@
         </el-form-item>
         <el-form-item label="实际付款时间" required>
           <el-date-picker
+            style="width: 100%"
             v-model.trim="form.actuallyDate"
             size="small"
             :clearable="true"