ly 1 anno fa
parent
commit
ea47f6b1fb

+ 3 - 0
src/views/business/collect/count/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <p>1111</p>
+</template>

+ 2 - 2
src/views/business/crm/noContractWorkOrder/index.vue

@@ -11,8 +11,8 @@
         >新增</el-button
       >
 
-      <!-- <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['business:workOrder:remove']">删除</el-button> -->
+      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['business:workOrder:remove']">删除</el-button>
       <el-dropdown trigger="click">
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>

+ 11 - 0
src/views/business/crm/order/form.vue

@@ -242,6 +242,17 @@
                 <span >{{ selectedOptionLabel }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="5">
+              <el-form-item label="甲方" prop="boss">
+                <el-input
+                  v-if="editStatus"
+                  v-model="form.boss"
+                  style="width: 100%; margin: 0; padding: 0"
+                  placeholder="请输入备注"
+                />
+                <span v-else>{{ form.boss }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="14">
               <el-form-item label="备注" prop="remark">
                 <el-input

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

@@ -450,7 +450,7 @@
             <el-col :span="6">
               <div class="details-head">
                 <div class="title">
-                  <i class="fa fa-th-list" aria-hidden="true" /> 附件
+                  <i class="fa fa-th-list" aria-hidden="true" /> 
                   <span style="color: red"><i style="color: red" /> *</span>
                 </div>
                 <el-upload
@@ -569,7 +569,7 @@
             placeholder="请输入审核意见"
           />
         </el-form-item>
-        <el-form-item label="附件" required>
+        <el-form-item label="附件" >
           <el-upload
             action="#"
             :http-request="upload2"
@@ -892,13 +892,13 @@ function verifyUpload() {
     proxy.$modal.msgError("请输入审核意见");
     return;
   }
-  if (
-    form.value.evidenceFiles == null ||
-    form.value.evidenceFiles.length === 0 || form.value.evidenceFiles.length>5
-  ) {
-    proxy.$modal.msgError("请上传凭证并至多上传5个");
-    return;
-  }
+  // if (
+  //   form.value.evidenceFiles == null ||
+  //   form.value.evidenceFiles.length === 0 || form.value.evidenceFiles.length>5
+  // ) {
+  //   proxy.$modal.msgError("请上传凭证并至多上传5个");
+  //   return;
+  // }
   form.value.arriveStatus = form.value.status === 1 ? 1 : 0;
   verifyCollection(form.value).then((res) => {
     open(form.value.id);

+ 16 - 16
src/views/business/financial/payment/form.vue

@@ -525,7 +525,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="附件" required>
+        <el-form-item label="附件" >
           <el-upload
             action="#"
             :http-request="upload2"
@@ -650,7 +650,7 @@
             placeholder="请输入审核意见"
           />
         </el-form-item>
-        <el-form-item label="附件" required>
+        <el-form-item label="附件" >
           <el-upload
             action="#"
             :http-request="upload3"
@@ -1054,13 +1054,13 @@ function verifyUpload() {
   }
 
 
-  if (
-    rejectForm.value.evidenceFiles == null ||
-    rejectForm.value.evidenceFiles.length === 0 || rejectForm.value.evidenceFiles.length>5
-  ) {
-    proxy.$modal.msgError("请上传附件并至多上传5个");
-    return;
-  }
+  // if (
+  //   rejectForm.value.evidenceFiles == null ||
+  //   rejectForm.value.evidenceFiles.length === 0 || rejectForm.value.evidenceFiles.length>5
+  // ) {
+  //   proxy.$modal.msgError("请上传附件并至多上传5个");
+  //   return;
+  // }
   verifyPayment(rejectForm.value).then((res) => {
     open(form.value.id);
     getList.value();
@@ -1081,13 +1081,13 @@ function cashierVerifyUpload() {
     proxy.$modal.msgError("请选择支出时间");
     return;
   }
-  if (
-    cashierForm.value.evidenceFiles == null ||
-    cashierForm.value.evidenceFiles.length === 0 || cashierForm.value.evidenceFiles.length>5
-  ) {
-    proxy.$modal.msgError("请上传附件并至多上传5个");
-    return;
-  }
+  // if (
+  //   cashierForm.value.evidenceFiles == null ||
+  //   cashierForm.value.evidenceFiles.length === 0 || cashierForm.value.evidenceFiles.length>5
+  // ) {
+  //   proxy.$modal.msgError("请上传附件并至多上传5个");
+  //   return;
+  // }
   if (
     cashierForm.value.verifyStatus === 4 &&
     (cashierForm.value.verifyComment == null ||