Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/workBillModule/components/add.vue

@@ -23,7 +23,7 @@
             <el-form-item label="操作类型" prop="actiontype">
               <el-select v-model="form.actiontype">
                 <el-option label="工序模板" value="工序模板"></el-option>
-                <el-option label="非工序模板" value="非工序模板"></el-option>
+                <el-option label="通用模板" value="非工序模板"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/HDrpManagement/workBillModule/components/edit.vue

@@ -23,7 +23,7 @@
             <el-form-item label="操作类型" prop="actiontype">
               <el-select :disabled="true" v-model="form.actiontype">
                 <el-option label="工序模板" value="工序模板"></el-option>
-                <el-option label="非工序模板" value="非工序模板"></el-option>
+                <el-option label="通用模板" value="非工序模板"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/HDrpManagement/workBillModule/modules/detail.vue

@@ -104,7 +104,7 @@ export default {
         },
         {
           label:'操作类型',
-          value:this.mainData.actiontype
+          value:this.mainData.actiontype == '非工序模板' ? '通用模板' : this.mainData.actiontype
         }
         
       ]

src/HManagement/archives_ad/dataAnalysis/modules/adReadData.vue

@@ -166,21 +166,24 @@ export default {
     },
 
     mounted() {
-        this.$api.requested({
-            "classname": this.type == 'agency' ? "webmanage.saletool.sharematerial.statistics.agent" : "webmanage.saletool.sharematerial.statistics.team",
-            "method": "getData",
-            "content": {
-                "sat_sharematerialid": this.$route.query.id
-            }
-        }).then(res => {
-            if (res.msg != '成功') return this.$message.error(res.data);
-            const data = [
-                { type: '未浏览', value: res.data.unReadNum },
-                { type: '已浏览', value: res.data.readNum },
-            ];
+        setTimeout(() => {
+            this.$api.requested({
+                "classname": this.type == 'agency' ? "webmanage.saletool.sharematerial.statistics.agent" : "webmanage.saletool.sharematerial.statistics.team",
+                "method": "getData",
+                "content": {
+                    "sat_sharematerialid": this.$route.query.id
+                }
+            }).then(res => {
+                if (res.msg != '成功') return this.$message.error(res.data);
+                const data = [
+                    { type: '未浏览', value: res.data.unReadNum },
+                    { type: '已浏览', value: res.data.readNum },
+                ];
 
-            this.renderer(data);
-        })
+                this.renderer(data);
+            })
+        },1000)
+        
     }
 }
 </script>

src/components/file-block/index.vue

@@ -125,10 +125,13 @@ export default {
   font-weight: bold;
   color: #333333;
   line-height: 22px;
+  display: -webkit-box;
   overflow: hidden;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
   text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 220px;
+  word-wrap:break-word;
+  width: 220px;
 }
 .item-file .left .text p:last-child {
   font-size: 10px;