update: 新入替换

build/webpack.base.conf.js

@@ -35,7 +35,8 @@ module.exports = {
   externals: {
     'vue': 'Vue',
     'vue-router': 'VueRouter',
-    'vuex': 'Vuex'
+    'vuex': 'Vuex',
+    'element-ui':'ELEMENT'
   },
   resolve: {
     extensions: ['.js', '.vue', '.json'],

index.html

@@ -13,7 +13,7 @@
   <meta charset="utf-8">
   <link rel="shortcut icon" href="./favicon.ico" />
   <title>好办管理平台</title>
-  <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.68.css" />
+  <!-- <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.4.css" /> -->
 
 </head>
 
@@ -21,16 +21,11 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <!-- 公共库引用 cdn -->
-  <script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
-  <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script>
-  <!-- <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.0.js"></script> -->
-  <!-- <script src="https://cdn.ravenjs.com/3.26.2/vue/raven.min.js" crossorigin="anonymous"></script> -->
   <script>
-    // Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();
+    (function() {
+        var host = window.location.host;
+        document.write('<script src="//'+ (host.indexOf('localhost')>-1?'four.gicdev.com':host) + '/component-library/static/import-component.js?timestrap='+ new Date().getTime() +'"><\/script>')
+      })()
   </script>
 </body>
 

src/components/app/cloudDaily/multiple-del.vue

@@ -139,7 +139,7 @@ export default {
     },
     secondConfirm() {
       const that = this;
-      this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成等，请知悉</div>', '', {
+      this.$confirm('删除任务后，会影响任务统计如已完成，完成率，待完成等，请知悉', '确认要删除吗？', {
         customClass: 'top-icon',
         closeOnClickModal: false,
         dangerouslyUseHTMLString: true,

src/components/app/taskView.vue

@@ -35,7 +35,7 @@
       </div>
       <el-table class="select-table" ref="multipleTable" :key="tableRefresh" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="45" :class-name="selectRadio == 1 ? 'cell-disabled' : 'font-size-zero'"> </el-table-column>
-        <el-table-column width="25">
+        <!-- <el-table-column width="25">
           <template slot="header">
             <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" placement="bottom-start">
               <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
@@ -46,7 +46,7 @@
             </el-dropdown>
           </template>
           <template slot-scope="scope">{{ scope ? ' ' : ' ' }}</template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="任务名称" width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.ecmName }}</template>
         </el-table-column>

src/main.js

@@ -12,14 +12,14 @@ promise.polyfill();
 // import Vue from 'vue';
 import App from './App';
 import router from './router';
-import ElementUI from 'element-ui'; //, { Message }
+// import ElementUI from 'element-ui'; //, { Message }
 import VueAxios from 'vue-axios';
 import axios from 'axios';
 import store from './store/store';
 /* eslint-disable  */
 import * as types from './store/types';
 import '../static/css/index.less';
-import 'element-ui/lib/theme-chalk/index.css';
+// import 'element-ui/lib/theme-chalk/index.css';
 import '../static/font/iconfont.css';
 import '../static/font//iconfont.js'
 import '../theme/index.css';
@@ -55,7 +55,7 @@ Vue.use(vueOfficeAside);
 Vue.use(vueOfficeHeader);
 
 Vue.config.productionTip = false;
-Vue.use(ElementUI, { size: 'large' });
+// Vue.use(ElementUI, { size: 'large' });
 Vue.use(VueAxios, axios);
 
 Vue.axios.defaults.withCredentials = true; // cookie访问

src/views/apps/customerApp/memberTagSet.vue

@@ -268,13 +268,7 @@ export default {
     },
     // 改变同步状态
     changeSync(row) {
-      this.$confirm('<div>确认关闭同步？</div><div>此为敏感操作！关闭同步后，企微标签库中该标签将会被立即删除， “企微好友”身上所被打的该标签也会被清除，请再次确认您的操作！</div>', '', {
-        customClass: 'top-icon',
-        closeOnClickModal: false,
-        dangerouslyUseHTMLString: true,
-        showClose: false,
-        type: 'warning'
-      })
+      this.$confirm('此为敏感操作！关闭同步后，企微标签库中该标签将会被立即删除， “企微好友”身上所被打的该标签也会被清除，请再次确认您的操作！', '确认关闭同步？')
         .then(() => {
           this.closeSync(row);
         })
@@ -338,13 +332,7 @@ export default {
       this.cancelIds = [];
     },
     checkSync() {
-      this.$confirm('<div>确认开启同步？</div><div>由于数据量可能过大以及企微限制，系统执行较缓慢，请耐心等待</div>', '', {
-        customClass: 'top-icon',
-        closeOnClickModal: false,
-        dangerouslyUseHTMLString: true,
-        showClose: false,
-        type: 'warning'
-      })
+      this.$confirm('由于数据量可能过大以及企微限制，系统执行较缓慢，请耐心等待', '确认开启同步？')
         .then(() => {
           this.handlePartSync();
         })

src/views/apps/quota/companyDaySet.vue

@@ -274,19 +274,11 @@ export default {
         }
       });
       if (!flagTip) {
-        this.$confirm('每日的权重不能为空,必须为数字,且不小于 0 ?', '提示', {
-          confirmButtonText: '确定',
-          showCancelButton: false,
-          type: 'warning'
-        }).then(() => {});
+        this.$confirm('每日的权重不能为空,必须为数字,且不小于 0 ?', '提示').then(() => {});
         return false;
       }
       that
-        .$confirm(that.settingStatus == 0 ? '点击即下发门店月指标任务，请确认是否提交？' : '此次提交只影响日指标值，不会触发月指标任务，请确认是否提交？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
+        .$confirm(that.settingStatus == 0 ? '点击即下发门店月指标任务，请确认是否提交？' : '此次提交只影响日指标值，不会触发月指标任务，请确认是否提交？', '提示')
         .then(() => {
           that.postSave(that.myObject.days);
         })

src/views/apps/quota/monthTaskDetail.vue

@@ -380,11 +380,7 @@ export default {
      * 删除
      */
     handleDel(index, row) {
-      this.$confirm(`确认要删除吗?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
+      this.$confirm(`确认要删除吗?`, '提示')
         .then(() => {
           this.postDel(index, row);
         })

src/views/enterprise/salutatory.vue

@@ -82,11 +82,7 @@ export default {
       const that = this;
       that.$refs.form.validate(value => {
         if (value) {
-          this.$confirm('是否确定修改欢迎语启用状态？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+          this.$confirm('是否确认修改欢迎语启用状态？', '提示')
             .then(() => {
               getRequest('/haoban-manage3-web/set-welcome', { openFlag: val })
                 .then(res => {

src/views/enterprise/salutatorySet.vue

@@ -90,11 +90,7 @@ export default {
       const that = this;
       that.$refs.form.validate(value => {
         if (value) {
-          this.$confirm('是否保存此欢迎语？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+          this.$confirm('确认保存此欢迎语？', '提示')
             .then(() => {
               const para = { ...that.form };
               getRequest('/haoban-manage3-web/save-welcome', para)

src/views/salesleads/trafficTask/taskDetail.vue

@@ -449,13 +449,7 @@ export default {
         });
         return false;
       }
-       this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉</div>', '', {
-        customClass: 'top-icon',
-        closeOnClickModal: false,
-        dangerouslyUseHTMLString: true,
-        showClose: false,
-        type: 'warning'
-      }).then(res => {
+       this.$confirm('删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉', '确认要删除吗？').then(res => {
           that.postMultDel();
       })
     },
@@ -518,13 +512,7 @@ export default {
      */
     handleDel(index, row) {
       const that = this;
-      this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉</div>', '', {
-        customClass: 'top-icon',
-        closeOnClickModal: false,
-        dangerouslyUseHTMLString: true,
-        showClose: false,
-        type: 'warning'
-      })
+      this.$confirm('删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉', '确认要删除吗？')
         .then(res => {
           that.postDel(index, row);
         })