n20-common-lib 1.3.1 → 1.3.4

package/src/components/NstcG6Components/NstcWorkBench/NstcWorkBench.vue

@@ -14,9 +14,8 @@
           <el-table-column prop="date" label="状态">
             <template> 待审核 </template>
           </el-table-column>
-          <el-table-column prop="typeName" label="交易类型"> </el-table-column>
-          <el-table-column prop="applyMember" label="单位名称">
-          </el-table-column>
+          <el-table-column prop="typeName" label="交易类型" />
+          <el-table-column prop="applyMember" label="单位名称" />
           <el-table-column prop="importantInfo" label="关键信息">
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="top">
@@ -58,26 +57,25 @@
               <!-- 1.已保存 2.已撤回 3.驳回至发起人 4.驳回至上一步 5.拒绝 6.进行中 7.已结束 8.已作废 -->
               {{
                 scope.row.state == 1
-                  ? "已保存"
+                  ? '已保存'
                   : scope.row.state == 2
-                  ? "已撤回"
+                  ? '已撤回'
                   : scope.row.state == 3
-                  ? "驳回至发起人"
+                  ? '驳回至发起人'
                   : scope.row.state == 4
-                  ? "驳回至上一步"
+                  ? '驳回至上一步'
                   : scope.row.state == 5
-                  ? "拒绝"
+                  ? '拒绝'
                   : scope.row.state == 6
-                  ? "进行中"
+                  ? '进行中'
                   : scope.row.state == 7
-                  ? "已结束"
-                  : "已作废"
+                  ? '已结束'
+                  : '已作废'
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="typeName" label="交易类型"> </el-table-column>
-          <el-table-column prop="applyMember" label="单位名称">
-          </el-table-column>
+          <el-table-column prop="typeName" label="交易类型" />
+          <el-table-column prop="applyMember" label="单位名称" />
           <el-table-column prop="importantInfo" label="关键信息">
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="top">
@@ -107,39 +105,50 @@
   </div>
 </template>
 <script>
-
-import axios from '@/utils/axios'
+import axios from '../../../utils/axios'
 export default {
   name: 'NstcWorkBench',
   data() {
     return {
-      taskSun: "",
+      taskSun: '',
       taskList: {},
-      pendingSun: "",
-      pendingList: {},
-    };
+      pendingSun: '',
+      pendingList: {}
+    }
+  },
+  mounted() {
+    this.intData()
   },
   methods: {
     async intData() {
       try {
         //待审核
-        let taskSun = await axios.post(`/bems/activiti/admin/todo/addQty`);
-        this.taskSun = taskSun.data;
-        let { data } = await axios.post(`/bems/activiti/admin/todo/todo`,{ pageNo: 1, pageSize: 3 });
-        this.taskList = data;
-      } catch (error) {console.log(error)}
+        let taskSun = await axios.post(`/bems/activiti/admin/todo/addQty`)
+        this.taskSun = taskSun.data
+        let { data } = await axios.post(`/bems/activiti/admin/todo/todo`, {
+          pageNo: 1,
+          pageSize: 3
+        })
+        this.taskList = data
+      } catch (error) {
+        console.log(error)
+      }
       try {
-        let pendingSun = await axios.post(`/bems/prod_1.0/activiti/temporaryStorage/addQty`);
-        this.pendingSun = pendingSun.data;
-        let { data } = await axios.post(`/bems/prod_1.0/activiti/temporaryStorage/todoTask`,{ pageNo: 1, pageSize: 3 });
-        this.pendingList = data;
-      } catch (error) {console.log(error)}
-    },
-  },
-  mounted() {
-    this.intData();
-  },
-};
+        let pendingSun = await axios.post(
+          `/bems/prod_1.0/activiti/temporaryStorage/addQty`
+        )
+        this.pendingSun = pendingSun.data
+        let { data } = await axios.post(
+          `/bems/prod_1.0/activiti/temporaryStorage/todoTask`,
+          { pageNo: 1, pageSize: 3 }
+        )
+        this.pendingList = data
+      } catch (error) {
+        console.log(error)
+      }
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .wraper {

package/src/components/NstcG6Components/Search/NstcSearch.vue

@@ -83,15 +83,15 @@
 </template>
 
 <script>
-import filterImg from '@/assets/svg/filter.svg'
-import filterImgActive from '@/assets/svg/filterActive.svg'
-import filterCloseImg from '@/assets/svg/filterClose@2x.png'
-import searchImg from '@/assets/svg/hourglass.svg'
-import searchImgActive from '@/assets/svg/searchActive.svg'
+import filterImg from '../../../assets/svg/filter.svg'
+import filterImgActive from '../../../assets/svg/filterActive.svg'
+import filterCloseImg from '../../../assets/svg/filterClose@2x.png'
+import searchImg from '../../../assets/svg/hourglass.svg'
+import searchImgActive from '../../../assets/svg/searchActive.svg'
 import NstcTableSet from '../NstcTableSet/NstcTableSet'
 import NstcForm from '../NstcForm/Component'
 import SvgIcon from '../NstcSvgIcon/NstcSvgIcon'
-import axios from '@/utils/axios'
+import axios from '../../../utils/axios'
 
 export default {
   name: 'NstcSearch',

package/src/components/NstcG6Components/approvelTwo/main.vue

@@ -11,7 +11,7 @@
 
 <script>
 import AppProgress from './progress.vue'
-import axios from '@/utils/axios'
+import axios from '../../../utils/axios'
 export default {
   name: 'NstcApprovelTwo',
   components: {

package/src/components/NstcG6Components/approvelTwo/progress.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import axios from '@/utils/axios'
+import axios from '../../../utils/axios'
 
 export default {
   name: 'ClApprovalProgress',

package/src/components/Search/index.vue

@@ -78,23 +78,23 @@
 </template>
 
 <script>
-import filterImg from '@/assets/svg/filter.svg'
-import filterImgActive from '@/assets/svg/filterActive.svg'
-import filterCloseImg from '@/assets/svg/filterClose@2x.png'
-import searchImg from '@/assets/svg/hourglass.svg'
-import searchImgActive from '@/assets/svg/searchActive.svg'
+// import filterImg from '@/assets/svg/filter.svg'
+// import filterImgActive from '@/assets/svg/filterActive.svg'
+// import filterCloseImg from '@/assets/svg/filterClose@2x.png'
+// import searchImg from '@/assets/svg/hourglass.svg'
+// import searchImgActive from '@/assets/svg/searchActive.svg'
 import NstcTableSet from '../NstcG6Components/NstcTableSet/NstcTableSet'
 import NstcForm from '../NstcG6Components/NstcForm/Component'
 import SvgIcon from '../NstcG6Components/NstcSvgIcon/NstcSvgIcon'
-import axios from '@/utils/axios'
+import axios from '../../utils/axios'
 
 export default {
   name: 'Search',
 
   components: {
     NstcTableSet,
-    NstcForm,
-    SvgIcon
+    NstcForm
+    // SvgIcon
   },
 
   props: {

package/src/index.js

@@ -53,7 +53,7 @@ import PageHeader from './components/PageHeader/index'
 import PlainText from './components/PlainText/index'
 import PlainTextItem from './components/PlainText/PlainTextItem'
 import ECharts from './components/ECharts/index'
-import Search from './components/Search/index.vue'
+// import Search from './components/Search/index.vue'
 import Stamp from './components/Stamp/index.vue'
 /* old */
 import TableO from './components/Table/indexO.vue'
@@ -143,7 +143,7 @@ const components = [
   PlainText,
   PlainTextItem,
   ECharts,
-  Search,
+  // Search,
   approvalImg,
   Stamp,
   /* old */
@@ -253,7 +253,7 @@ export {
   PlainText,
   PlainTextItem,
   ECharts,
-  Search,
+  // Search,
   approvalImg,
   Stamp
 }