Merge branch 'cpq-dev' of wangfan/adweb3-web into master

src/views/adweb/enquiry/AdwebEnquiry.data.ts

@@ -318,6 +318,15 @@ export const formSchema: FormSchema[] = [
       async: true,
     },
   },
+  {
+    label: '图片上传',
+    field: 'enquiryFile',
+    component: 'JImageUpload',
+    componentProps: {
+      fileMax: 1,
+      bizPath: 'enquiry',
+    },
+  },
 ];
 
 // 高级查询数据

src/views/adweb/enquiry/modules/enquiryDetail.vue

@@ -100,6 +100,14 @@ v-if="edition === 1" :href="record.fromPage.substring(record.fromPage.indexOf('h
             </a-descriptions-item>
           </a-descriptions>
         </div>
+
+        <p class="enquiry-file" v-if="record.enquiryFile">
+          <span>询盘文件：</span>
+          <img
+            :width="200"
+            :src="record.enquiryFile"
+          />
+        </p>
       </a-spin>
     </div>
 

src/views/adweb/enquiry/modules/enquiryVerifyProcess.vue

@@ -6,17 +6,17 @@
           <template #title>
             <div v-if="item.status == 1" style="width: 100%; line-height: 21px">
               <span>{{ item.name }}</span>
-              <a-button
-                style="margin-left: 16px"
-                ghost
-                disabled
-                v-if="!isCustomer"
-                type="primary"
-                size="small"
-                @click="finishOrRollbackStep(item.id, 0, null, item.nodeType, item.description)"
-              >
-                撤销
-              </a-button>
+              <!--              <a-button-->
+              <!--                style="margin-left: 16px"-->
+              <!--                ghost-->
+              <!--                disabled-->
+              <!--                v-if="!isCustomer"-->
+              <!--                type="primary"-->
+              <!--                size="small"-->
+              <!--                @click="finishOrRollbackStep(item.id, 0, null, item.nodeType, item.description)"-->
+              <!--              >-->
+              <!--                撤销-->
+              <!--              </a-button>-->
 
               <span style="margin-left: 40px">{{ item.finTime }}</span>
             </div>

src/views/adweb/enterprise/EnterpriseUserManage.data.ts

@@ -233,6 +233,7 @@ export const formSchema: FormSchema[] = [
     component: 'JImageUpload',
     componentProps: {
       fileMax: 1,
+      bizPath: 'avatar',
     },
   },
 ];

src/views/adweb/theme/AdwebTheme.data.ts

@@ -61,6 +61,7 @@ export const formSchema: FormSchema[] = [
     component: 'JImageUpload',
     componentProps: {
       fileMax: 1,
+      bizPath: 'theme',
     },
   },
   {

src/views/system/tenant/tenant.data.ts

@@ -134,6 +134,8 @@ export const formSchema: FormSchema[] = [
     component: 'JImageUpload',
     componentProps: {
       text: 'logo',
+      fileMax: 1,
+      bizPath: 'company_logo',
     },
   },
   {

src/views/system/user/user.data.ts

@@ -210,6 +210,7 @@ export const formSchema: FormSchema[] = [
     component: 'JImageUpload',
     componentProps: {
       fileMax: 1,
+      bizPath: 'business_license',
     },
   },
   {
@@ -318,6 +319,7 @@ export const formSchema: FormSchema[] = [
     component: 'JImageUpload',
     componentProps: {
       fileMax: 1,
+      bizPath: 'avatar',
     },
   },
   {