Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/form/demoForm2.vue

@@ -1827,7 +1827,7 @@ function updateModel (object, childIndex) {
 </script>
 <style lang="less" scoped>
 @media print {
-    @page {
+  @page {
     /* 横向 */
     size: landscape;
     /* 去除浏览器默认页眉页脚 */
@@ -1837,10 +1837,19 @@ function updateModel (object, childIndex) {
   * {
     -webkit-print-color-adjust: exact !important;   /* Chrome, Safari */
     color-adjust: exact !important;                 /*Firefox*/
-}
+  }
   .noprint {
     display: none;
   }
+  /deep/ .ant-select-selection--multiple .ant-select-selection__rendered>ul>li, .ant-select-selection--multiple>ul>li{
+      font-size: 14px!important;
+      border: 0px solid black!important;
+      min-width: 90px!important;
+      height: 25!important;
+   }
+   /deep/ .ant-select-selection__choice__remove{
+     display: none;
+   }
   // /deep/.ant-input{
   //     border: none !important;
   // }

src/views/dashboard/MyToDo.vue

@@ -78,7 +78,7 @@
           </template>
 
           <div class="dataV">
-            <dv-scroll-board class="board" :config="config" style="height:280px;" @click="getMethod" />
+            <dv-scroll-board class="board" :config="config" style="cursor: pointer;height:280px;" @click="getMethod" />
           </div>
         </a-card>
       </a-col>

src/views/dashboard/MyoaTabs.vue

@@ -6,7 +6,7 @@
           <dv-scroll-board
             class="board"
             :config="todoConfig"
-            style="width:100%;height:148px;color:#333;"
+            style="cursor: pointer;width:100%;height:148px;color:#333;"
             @click="todoClick"
           />
         </div>
@@ -17,7 +17,7 @@
           <dv-scroll-board
             class="board"
             :config="applyConfig"
-            style="width:100%;height:166px;color:#333;"
+            style="cursor: pointer;width:100%;height:166px;color:#333;"
             @click="applyClick"
           />
         </div>
@@ -28,7 +28,7 @@
           <dv-scroll-board
             class="board"
             :config="doneConfig"
-            style="width:100%;height:166px;color:#333;"
+            style="cursor: pointer;width:100%;height:166px;color:#333;"
             @click="doneClick"
           />
         </div>

src/views/system/modules/UserModal.vue

@@ -214,6 +214,8 @@
 
         <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload class="avatar-uploader" text="上传" v-model="fileList"></j-image-upload>
+          <!-- 删除图标 -->
+          <i title="删除" v-if="fileList != null && fileList != ''" style="cursor: pointer;" @click="deleteImage()">X</i>
         </a-form-item>
 
         <a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -587,6 +589,9 @@ export default {
         }
     },
     methods: {
+      deleteImage() {
+        this.fileList = '';
+      },
        validateIdCard(rule, value, callback) {
         if (!value || new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/).test(value)) {
           callback();