Signed-off-by: liuboyan <632697560@qq.com>

二开

package-lock.json

@@ -1262,8 +1262,7 @@
     "batch-processor": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/batch-processor/download/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=",
-      "dev": true
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -2781,8 +2780,7 @@
     "deepmerge": {
       "version": "2.2.1",
       "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-2.2.1.tgz?cache=0&sync_timestamp=1572279556265&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-2.2.1.tgz",
-      "integrity": "sha1-XT/yKgHAD2RUBaL7wX0HeKGAEXA=",
-      "dev": true
+      "integrity": "sha1-XT/yKgHAD2RUBaL7wX0HeKGAEXA="
     },
     "defined": {
       "version": "1.0.0",
@@ -3081,7 +3079,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npm.taobao.org/element-resize-detector/download/element-resize-detector-1.2.1.tgz",
       "integrity": "sha1-sDBRlER6SGMVXljxMyOgrvMIUdE=",
-      "dev": true,
       "requires": {
         "batch-processor": "1.0.0"
       }
@@ -5241,7 +5238,7 @@
     },
     "iview": {
       "version": "3.5.4",
-      "resolved": "https://registry.npm.taobao.org/iview/download/iview-3.5.4.tgz?cache=0&sync_timestamp=1575428109542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fiview%2Fdownload%2Fiview-3.5.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/iview/download/iview-3.5.4.tgz?cache=0&sync_timestamp=1594968731404&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fiview%2Fdownload%2Fiview-3.5.4.tgz",
       "integrity": "sha1-1Ra5LnO2F/Lcf0WDH5kFnWmTL4I=",
       "dev": true,
       "requires": {
@@ -5312,8 +5309,7 @@
     "js-calendar": {
       "version": "1.2.3",
       "resolved": "https://registry.npm.taobao.org/js-calendar/download/js-calendar-1.2.3.tgz",
-      "integrity": "sha1-pYOwZEtOaVujlPNE0QPbzHp6fT4=",
-      "dev": true
+      "integrity": "sha1-pYOwZEtOaVujlPNE0QPbzHp6fT4="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -5554,8 +5550,7 @@
     "lodash.throttle": {
       "version": "4.1.1",
       "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=",
-      "dev": true
+      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {
       "version": "4.5.0",
@@ -6810,8 +6805,7 @@
     "popper.js": {
       "version": "1.16.1",
       "resolved": "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz",
-      "integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=",
-      "dev": true
+      "integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs="
     },
     "portfinder": {
       "version": "1.0.13",
@@ -10537,10 +10531,9 @@
       }
     },
     "tinycolor2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
-      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=",
-      "dev": true
+      "version": "1.4.2",
+      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz",
+      "integrity": "sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM="
     },
     "to-arraybuffer": {
       "version": "1.0.1",
@@ -10972,6 +10965,33 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "view-design": {
+      "version": "4.5.0-beta.3",
+      "resolved": "https://registry.npm.taobao.org/view-design/download/view-design-4.5.0-beta.3.tgz?cache=0&sync_timestamp=1611130982292&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fview-design%2Fdownload%2Fview-design-4.5.0-beta.3.tgz",
+      "integrity": "sha1-xv/qeYIBJ+A5/7fU8QuM4zIySPQ=",
+      "requires": {
+        "async-validator": "^3.3.0",
+        "deepmerge": "^2.2.1",
+        "element-resize-detector": "^1.2.0",
+        "js-calendar": "^1.2.3",
+        "lodash.throttle": "^4.1.1",
+        "popper.js": "^1.14.6",
+        "tinycolor2": "^1.4.1",
+        "v-click-outside-x": "^3.7.1"
+      },
+      "dependencies": {
+        "async-validator": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-3.5.1.tgz?cache=0&sync_timestamp=1605751798748&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-3.5.1.tgz",
+          "integrity": "sha1-zWK5aIskZfSEIOJ620d2CrG1VZ8="
+        },
+        "v-click-outside-x": {
+          "version": "3.7.1",
+          "resolved": "https://registry.npm.taobao.org/v-click-outside-x/download/v-click-outside-x-3.7.1.tgz",
+          "integrity": "sha1-qgPqoOQeRMtSB9z4bC2fDdZAhME="
+        }
+      }
+    },
     "viewerjs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.2.0.tgz",

package.json

@@ -20,6 +20,7 @@
     "url-search-params": "^0.10.0",
     "url-search-params-polyfill": "^2.0.1",
     "v-viewer": "^1.2.1",
+    "view-design": "^4.5.0-beta.3",
     "vue": "^2.5.16",
     "vue-cropper": "^0.3.6",
     "vue-i18n": "^8.0.0",

src/main.js

@@ -6,26 +6,26 @@ import App from './App'
 import {router} from './router'
 import VueRouter from 'vue-router'
 import VueResource from 'vue-resource'
-import iView from 'iview';
+import ViewUI from 'view-design';
 import stores from './store/'
 import './assets/js/lib/css'
 import './assets/js/lib/script'
 import './assets/iconfont/iconfont.css'
 import Viewer from 'v-viewer';
 import 'viewerjs/dist/viewer.css';
+import 'view-design/dist/styles/iview.css';
 
 // 引用API文件
 import api from '../config/axios.api.js'
 import xml from '../config/xml.parse.js'
 //国际化
-import VueI18n from 'vue-i18n';
-import en from 'iview/dist/locale/en-US';
-import zh from 'iview/dist/locale/zh-CN';
+import en from 'view-design/dist/locale/en-US';
+import zh from 'view-design/dist/locale/zh-CN';
 import localMessage from './locale'
 import moment from 'moment'
 //打印
 import Print from 'vue-print-nb'
-Vue.use(Print); 
+Vue.use(Print);
 
 // 将API方法绑定到全局
 Vue.prototype._api = api;
@@ -38,7 +38,6 @@ Vue.prototype.formatTypes = ['jpg','jpeg','BMP','GIF','PNG','txt','pdf','doc',
 'DV-AVI','DIVX','MOV','ASF','WMV','RM','RMVB','vcd','cd','dvd'];
 Vue.use(VueRouter)
 Vue.use(VueResource)
-Vue.use(VueI18n);
 
 Vue.use(Viewer);
 Viewer.setDefaults({
@@ -47,24 +46,11 @@ Viewer.setDefaults({
     "transition": true, "fullscreen": true, "keyboard": true, "url": "data-source" }
 });
 
-
-const messages = {
-  en: Object.assign(localMessage.en, en),
-  zh: Object.assign(localMessage.zh, zh)
-};
-
-
-const i18n = new VueI18n({
-  locale: 'zh',  // set locale
-  messages  // set locale messages
-});
-
-Vue.use(iView, { i18n: (key, value) => i18n.t(key, value)});
+Vue.use(ViewUI);
 
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
-  i18n,
   router: router,
   store:stores,
   template: '<App/>',

src/page/baseInfo/components/supply/supplyEdit.vue

@@ -238,7 +238,7 @@
             <Button v-if="tabs == '4'&& canEdit" type="primary" @click="addXzyhzh">新增账号</Button>
           </span>
           <TabPane label="供货详情" name="1">
-            <Table :columns="table1Column" style="width: 100%" :data="table1Data" :loading="tableLoading">
+            <Table :columns="table1Column" style="width: 100%" :data="table1Data" :loading="tableLoading" highlight-row>
               <template slot-scope="{ row, index }" slot="totalPrice">
                 <div>{{ row.numbers * row.salePrice }}</div>
               </template>
@@ -246,7 +246,7 @@
             <Page align="right" @on-change="page1Change" :total="page1Total" show-total />
           </TabPane>
           <TabPane label="报价记录" name="2">
-            <Table :columns="table2Column" style="width: 100%" :data="table2Data" :loading="tableLoading">
+            <Table :columns="table2Column" style="width: 100%" :data="table2Data" :loading="tableLoading" highlight-row>
               <template slot-scope="{ row, index }" slot="action">
                 <div>
                   <a href="javascript:;" v-if="buttonShow.editPrice" @click="editBj(row)">编辑</a>
@@ -257,7 +257,7 @@
             <Page align="right" @on-change="page2Change" :total="page2Total" show-total />
           </TabPane>
           <TabPane label="联系人" name="3">
-            <Table :columns="table3Column" style="width: 100%" :data="table3Data" :loading="tableLoading">
+            <Table :columns="table3Column" style="width: 100%" :data="table3Data" :loading="tableLoading" highlight-row>
               <template slot-scope="{ row, index }" slot="gpcSex">
                 <div>{{ row.gpcSex == '1' ? '男' : '女' }}</div>
               </template>
@@ -274,7 +274,7 @@
             <Page align="right" @on-change="page3Change" :total="page3Total" show-total />
           </TabPane>
           <TabPane label="银行账号" name="4">
-            <Table :columns="table4Column" style="width: 100%" :data="table4Data" :loading="tableLoading">
+            <Table :columns="table4Column" style="width: 100%" :data="table4Data" :loading="tableLoading" highlight-row>
               <template slot-scope="{ row, index }" slot="gpbcDefault">
                 <div>{{ row.gpbcDefault == '1' ? '是' : '否' }}</div>
               </template>
@@ -348,7 +348,7 @@
           <Button>批量引入</Button>
           </Col>
         </Row>
-        <Table :columns="yrryColumn" style="width: 100%" :data="yrryData" :loading="tableLoading">
+        <Table :columns="yrryColumn" style="width: 100%" :data="yrryData" :loading="tableLoading" highlight-row>
           <template slot-scope="{ row, index }" slot="action">
             <div>
               <a href="javascript:;">添加</a>

src/page/baseInfo/supply.vue

@@ -78,6 +78,7 @@
         :height="resizeHeight - 65"
         :loading="tableLoading"
         @on-row-dblclick="goDetail"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="gpEnabledState">
           <span>{{ row.gpEnabledState == "1" ? "未启用" : "启用"}}</span>

src/page/purchase/components/balance/balanceAdd.vue

@@ -174,7 +174,7 @@
           <Button type="primary" :disabled="balanceType == 'add' || (form.spzt != '1' && form.spzt != '4')"
             @click="addMxShow">新增明细</Button>
         </div>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading">
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row>
           <template slot-scope="{ row, index }" slot="cz">
             <div v-if="form.spzt == '1' || form.spzt== '4'">
               <a href="javascript:;" @click="deleteMx(row, index)">删除</a>

src/page/purchase/components/balance/balanceMxAdd.vue

@@ -50,6 +50,7 @@
         @on-select-cancel="tableOnCancel"
         @on-select-all="tableOnSelect"
         @on-select-all-cancel="tableOnCancel"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="action">
           <div>
@@ -264,4 +265,4 @@ ivu-card-head-inner,
   border-left: 1px solid #e4e4e4;
   border-top: 1px solid #e4e4e4;
 }
-</style>
+</style>

src/page/purchase/components/order/orderAdd.vue

@@ -207,7 +207,7 @@
             ">新增明细</Button>
         </div>
         <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"
-          @on-select="tableOnSelect">
+          @on-select="tableOnSelect" highlight-row>
           <template slot-scope="{ row, index }" slot="purchaseNum">
             <InputNumber :min="1" :precision="2" :disabled="
                 (form.spzt != '1' && form.spzt != '4') || row.isCancel == '1'

src/page/purchase/components/order/orderMxAdd.vue

@@ -38,6 +38,7 @@
         @on-select-cancel="tableOnCancel"
         @on-select-all="tableOnSelect"
         @on-select-all-cancel="tableOnCancel"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="action">
           <div>
@@ -342,4 +343,4 @@ ivu-card-head-inner,
   border-left: 1px solid #e4e4e4;
   border-top: 1px solid #e4e4e4;
 }
-</style>
+</style>

src/page/purchase/components/plan/planAdd.vue

@@ -137,9 +137,9 @@
               planType == 'add' || form.spzt == '2' || form.spzt == '1'
             ">新增明细</Button>
         </div>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row
           @on-select="tableOnSelect" @on-select-cancel="tableOnCancel" @on-select-all="tableOnSelect"
-          @on-select-all-cancel="tableOnCancel">
+          @on-select-all-cancel="tableOnCancel" class="">
           <template slot-scope="{ row, index }" slot="amount">
             <div>
               <InputNumber :min="1" :precision="2" v-model="tableData[index].amount"

src/page/purchase/components/plan/planMxAdd.vue

@@ -27,7 +27,7 @@
       </Row>
       <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"
         @on-select="tableOnSelect" @on-select-cancel="tableOnCancel" @on-select-all="tableOnSelect"
-        @on-select-all-cancel="tableOnCancel">
+        @on-select-all-cancel="tableOnCancel" highlight-row>
         <template slot-scope="{ row, index }" slot="action">
           <div>
             <a href="javascript:;">编辑</a>

src/page/purchase/components/pool/poolAdd.vue

@@ -202,7 +202,7 @@
           <Button type="primary" @click="mxAddShow" :disabled="orderType == 'add'">新增明细</Button>
         </div>
         <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"
-          @on-select="tableOnSelect">
+          @on-select="tableOnSelect" highlight-row>
           <template slot-scope="{ row, index }" slot="purchaseNum">
             <InputNumber :min="1" :precision="2" :disabled="form.spzt == '2'" v-model="tableData[index].purchaseNum"
               placeholder="请输入" style="width: 95%" />

src/page/purchase/components/pool/poolMxAdd.vue

@@ -38,6 +38,7 @@
         @on-select-cancel="tableOnCancel"
         @on-select-all="tableOnSelect"
         @on-select-all-cancel="tableOnCancel"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="action">
           <div>
@@ -334,4 +335,4 @@ ivu-card-head-inner,
   border-left: 1px solid #e4e4e4;
   border-top: 1px solid #e4e4e4;
 }
-</style>
+</style>

src/page/purchase/purchaseBalance.vue

@@ -74,6 +74,7 @@
         :loading="tableLoading"
         @on-select="tableOnSelect"
         @on-row-dblclick="goDetail"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="approvalState">
           <span v-if="row.approvalState == '1'">未提交</span>

src/page/purchase/purchaseOrder.vue

@@ -82,6 +82,7 @@
         :loading="tableLoading"
         @on-select="tableOnSelect"
         @on-row-dblclick="goDetail"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="approvalState">
           <div>

src/page/purchase/purchasePlan.vue

@@ -83,6 +83,7 @@
         :loading="tableLoading"
         @on-select="tableOnSelect"
         @on-row-dblclick="goDetail"
+        highlight-row
       >
         <template slot-scope="{ row, index }" slot="status">
           <div>
@@ -342,6 +343,7 @@ export default {
         this.$Message.error("获取分管采购员列表失败！");
       }
     });
+    this.searchForm.title = localStorage.user_name
   },
   methods: {
     //获取按钮权限

src/page/purchase/purchasePool.vue

@@ -61,8 +61,9 @@
         @on-select-cancel="tableOnCancel"
         @on-select-all="tableOnSelectAll"
         @on-select-all-cancel="tableOnCancelAll"
+        highlight-row
       ></Table>
-      <Page align="right" :current="pageNum" :total="pageTotal" @on-change="pageChange" show-total />
+      <Page align="right" :current="pageNum" :total="pageTotal" :page-size="50" @on-change="pageChange" show-total />
     </Card>
     <poolAdd
       ref="add"
@@ -650,7 +651,7 @@ export default {
       projectList.forEach((a) => allProject.push(a.projectId));
       let postData = {
         page: this.pageNum,
-        pageSize: 10,
+        pageSize: 50,
         firstClassId: this.searchForm.yjfl,
         secondClassId: this.searchForm.ejfl,
         areaIds: this.searchForm.ssqy,
@@ -755,4 +756,4 @@ ivu-card-head-inner,
   white-space: nowrap;
   font-weight: normal;
 }
-</style>
+</style>

src/page/purchaseView/allot.vue

@@ -38,7 +38,7 @@
       </Card>
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p key="title">内部调拨明细</p>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"></Table>
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row></Table>
       </Card>
     </div>
   </div>
@@ -201,4 +201,4 @@ ivu-card-head-inner,
   white-space: nowrap;
   font-weight: normal;
 }
-</style>
+</style>

src/page/purchaseView/balance.vue

@@ -113,7 +113,7 @@
       </Card>
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">结算明细</p>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading">
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row>
           <template slot-scope="{ row, index }" slot="totalPrice">
             <div>{{ row.totalPrice.toFixed(3) }}</div>
           </template>

src/page/purchaseView/order.vue

@@ -122,7 +122,7 @@
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">采购明细</p>
         <div slot="extra"></div>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading">
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row>
           <template slot-scope="{ row, index }" slot="purchaseNum">{{ row.purchaseNum }}</template>
           <template slot-scope="{ row, index }" slot="price">{{ row.price.toFixed(3) }}</template>
           <template slot-scope="{ row, index }" slot="totalPrice">

src/page/purchaseView/plan.vue

@@ -77,7 +77,7 @@
       </Card>
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">申购计划明细</p>
-        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading">
+        <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" highlight-row>
           <template slot-scope="{ row, index }" slot="amount">
             <div>{{ row.amount }}</div>
           </template>

src/page/report/historyCost.vue

@@ -51,6 +51,7 @@
         :data="tableData"
         :height="resizeHeight - 65"
         :loading="tableLoading"
+        highlight-row
       ></Table>
       <Page align="right" :current="pageNum" :total="pageTotal" @on-change="pageChange" show-total />
     </Card>
@@ -244,4 +245,4 @@ ivu-card-head-inner,
   white-space: nowrap;
   font-weight: normal;
 }
-</style>
+</style>

src/page/report/purchasePlan.vue

@@ -81,6 +81,7 @@
         :data="tableData"
         :height="resizeHeight - 65"
         :loading="tableLoading"
+        highlight-row
       ></Table>
       <Page align="right" :total="pageTotal" @on-change="pageChange" show-total />
     </Card>
@@ -237,4 +238,4 @@ ivu-card-head-inner,
   white-space: nowrap;
   font-weight: normal;
 }
-</style>
+</style>