Selaa lähdekoodia

feat(组件): 修改问题

tangning 2 vuotta sitten
vanhempi
commit
e40e3b5fcc

+ 1 - 1
src/locales/lang/zh-CN/routes/product.ts

@@ -25,7 +25,7 @@ export default {
   },
   outType:{
     0:'正常销售',
-    4:'经销商销售',
+    4:'经销商',
     1:'员工自用',
     2:'礼品赠送',
     3:'其他',

+ 1 - 4
src/views/account/overview/AddModal.vue

@@ -62,9 +62,6 @@
             componentProps: {
             api: async function () {
               const res = await dincrementList();
-              console.log('incrementTypeId',res)
-              return [{name:'专业',value:2},
-                      {name:'高级',value:3},]
               return res.map(ele => {
                 return {name:ele.name,value:ele.id}
               });
@@ -82,7 +79,7 @@
                             {field: 'incrementEndTime',componentProps: { disabled:value=='3',}}])
               setFieldsValue({
                 monthQy:1,
-                incrementEndTime: dayjs().add(1,value!='3'?'month':'year').format('YYYY-MM-DD'),
+                incrementEndTime: dayjs().add(1,value=='3'?'month':'year').format('YYYY-MM-DD'),
               });
             }
           },

+ 1 - 1
src/views/dashboard/analysis/components/lineEcharts.vue

@@ -141,7 +141,7 @@ watch(
       ],
       series: [
         {
-          name: 'Adidas',
+          name: '用户趋势',
           type: 'line',
           data: propsData.yData,
           symbolSize: 1,

+ 5 - 2
src/views/operate/components/new/addModal.vue

@@ -181,9 +181,12 @@
         data && onDataReceive(data);
       });
       const formatrichtext = (richtext, len = 0) => {
-          let content = richtext.replace(/<.+?>/g, '');    
-          content = content.replace(/ /ig, ''); /* 去除  */    
+          let content = richtext.replace(/<[^>]+>/g,"");    
+          content = richtext.replace(/<.+?>/g, '');  
+          content = content.replace(/ /ig, ''); /* 去除  */    ;
+          // content = content.replace(/&nbsp/ig, ''); /* 去除  */   
           content = content.replace(/\s/ig, ''); /* 去除空格 */
+          console.log('formatrichtext',content && content.length)
           return content && content.length;
       }
       async function onDataReceive(data) {

+ 15 - 2
src/views/staff/adddetailsModal.vue

@@ -160,7 +160,7 @@
           show: false,
         },
       ];
-      const title = ref('编辑账号');
+      const title = ref('新增账号');
       const { createMessage } = useMessage();
       const [registerForm, { setFieldsValue, validate, updateSchema, resetFields }] = useForm({
         labelWidth: 120,
@@ -175,9 +175,22 @@
         data && onDataReceive(data);
       });
       function onDataReceive(data) {
+        console.log('onDataReceive',data)
         // 方式1;
         setTimeout(()=>{
-          // updateSchema(setSchema);
+          preventAutoFill.value = false
+          updateSchema([{
+            field: 'userName',
+            componentProps:{
+              readonly:false,
+            }
+          },{
+            field: 'password',
+            componentProps:{
+              readonly:false,
+            }
+          }])
+          // updateSchema(schemas);
         },500)
       }
       function companyIdChange(companyId) {

+ 1 - 1
src/views/staff/detailsModal.vue

@@ -103,7 +103,7 @@
           show: false,
         },
       ];
-      const title = ref('新增账号');
+      const title = ref('编辑账号');
       const { createMessage } = useMessage();
       const [registerForm, { setFieldsValue, validate, updateSchema, resetFields }] = useForm({
         labelWidth: 120,

+ 6 - 2
src/views/statistics/components/sceneEchart.vue

@@ -33,13 +33,17 @@
     emit('change',val)
   }
   function expor(val){
+    let fileTile = props.title||'订单数据'
     let fields  = {
     'time':'日期',
     'kj':'看见场景',
     'kk':'看看场景',
     'ss':'深时场景',
     'dy':'深时obj',
-  }
+    }
+    if('场景趋势分析' == fileTile){
+      fileTile = `${val && val.value == 0?'新增':'累计'}`+fileTile
+    }
     let data = yixStringData.value.map((ele,index) => {
       return {
         'time':ele,
@@ -49,7 +53,7 @@
         'dy':ssobjList.value && ssobjList.value[index] || 0,
       }
     })
-    exportElsxFile(data,fields,props.title||'订单数据')
+    exportElsxFile(data,fields,fileTile)
   }
   function handlesetOptions() {
     setOptions({