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

package-lock.json

@@ -7101,8 +7101,8 @@
     },
     "lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz",
-      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -11578,6 +11578,11 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typescript": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.nlark.com/uglify-js/download/uglify-js-3.4.10.tgz",
@@ -12015,6 +12020,14 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vue-text-format": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/vue-text-format/-/vue-text-format-1.2.6.tgz",
+      "integrity": "sha512-sElP1rPPiNNrzVB+Sx/3QxF/bumsA5Nrv+PDLZQAlTEqn+ll3JIacaGFovhWH8NFjjXqw/0+joYkabWM20sCdg==",
+      "requires": {
+        "typescript": "^3.6.3"
+      }
+    },
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.nlark.com/vuex/download/vuex-3.6.2.tgz",

package.json

@@ -20,6 +20,7 @@
     "js-base64": "^2.5.1",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
+    "lodash": "^4.17.21",
     "mockjs": "^1.0.1-beta3",
     "node-gyp": "^5.0.6",
     "nprogress": "^0.2.0",
@@ -29,6 +30,7 @@
     "vue-axios": "^2.1.2",
     "vue-i18n": "^8.7.0",
     "vue-router": "^3.0.1",
+    "vue-text-format": "^1.2.6",
     "vuex": "^3.1.1"
   },
   "devDependencies": {

src/components/basic-block/main.vue

@@ -71,8 +71,7 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
+<style lang="scss" scoped>
 .basic-block {
   opacity: 0;
 

src/main.js

@@ -22,6 +22,8 @@ import thirdRegister from './components/third-register/main';
 import avueUeditor from 'avue-plugin-ueditor';
 import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
+import format from 'vue-text-format';//v-format
+
 // 注册全局crud驱动
 window.$crudCommon = crudCommon;
 // 加载Vue拓展
@@ -36,6 +38,7 @@ Vue.use(window.AVUE, {
   calcHeight: 65,
   i18n: (key, value) => i18n.t(key, value)
 });
+Vue.use(format);//v-format
 // 注册全局容器
 Vue.component('basicContainer', basicContainer);
 Vue.component('basicBlock', basicBlock);

src/router/views/index.js

@@ -327,6 +327,36 @@ export default [{
       }
     ]
   },
+  // 结算修改页
+  {
+    path: '/task_editPages',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/task_editPages',
+        meta: {
+          i18n: 'task_editPages'
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/workManagement/task/taskEdit')
+      }
+    ]
+  },
+  // 任务修改页
+  {
+    path: '/settleAccounts_editPages',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/settleAccounts_editPages',
+        meta: {
+          i18n: 'settleAccounts_editPages'
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/workManagement/receipt/settleAccountsEdit')
+      }
+    ]
+  },
     {
         path: '/work/process/leave',
         component: Layout,

src/styles/variables.scss

@@ -2,4 +2,10 @@
 $mainBg: #409eff;
 .avue-form__menu--center {
   text-align: right;
+}
+.el-col {
+  margin-bottom: 0px !important;
+}
+p{
+  margin: 0 !important;
 }

src/util/filters.js

@@ -0,0 +1,4 @@
+//金额千分符
+export function thousandsFormatting(amount) {
+    return this.textFormat(amount,'#,##0.00')
+}

src/views/maintenance/priceManagement/detailsPageEdit.vue

@@ -26,7 +26,7 @@
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <span v-else-if="item.type === 'select'">
                   <el-select v-model="form[item.prop]" slot="prepend" style="width: 100%;" size="small" placeholder="请选择">
-                  <el-option v-for="item in item.dicData" :label="item.label" :value="item.value"></el-option>
+                  <el-option v-for="(item,index2) in item.dicData" :key="index2" :label="item.label" :value="item.value"></el-option>
                 </el-select>
                 </span>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>

src/views/wel/components/butCard.vue

@@ -0,0 +1,44 @@
+<template>
+  <div style="padding:5px">
+    <div class="card">
+      <div class="card-content">
+        <i :class="iconName"></i>
+        <div>{{ name }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    name: {
+      type: String
+    },
+    iconName: {
+      type: String
+    }
+  },
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped>
+.card{
+  background: #ff7d13;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 14vh;
+  .card-content{
+    text-align: center;
+    color: #fff;
+    i{
+      font-size: 30px;
+    }
+  }
+}
+</style>

src/views/wel/components/card.vue

@@ -4,7 +4,9 @@
       <div class="card-head">
         <span> <i :class="iconName" class="index-icon"></i>{{title}}</span>
       </div>
-      <div class="card-content"></div>
+      <div class="card-content">
+        <slot name='content'></slot>
+      </div>
     </div>
   </div>
 </template>
@@ -42,7 +44,7 @@ export default {
     border-right: 1px solid #d6d6d6;
     border-bottom: 1px solid #d6d6d6;
     padding: 10px;
-    height: 18.2vh;
+    height: 100%;
   }
 }
 .index-icon {

src/views/wel/index.vue

@@ -1,22 +1,74 @@
 <template>
   <basic-container>
-    <el-row>
+    <div class="container">
+      <div class="container-items">
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+      </div>
+      <index-card title="今日工作看板" iconName="el-icon-view">
+        <div slot="content" style="height:25vh"></div>
+      </index-card>
+      <index-card title="待办事项" iconName="el-icon-s-fold">
+        <div slot="content" style="height:17vh"></div>
+      </index-card>
+      <index-card title="今日营业" iconName="el-icon-chat-line-round">
+        <div slot="content" style="height:17vh" class="operate">
+          <div class="operate-item">
+            <div>
+              今日到店
+              <p>0</p>
+              台次
+            </div>
+          </div>
+          <div class="operate-item">
+            <div>
+              今日到店
+              <p>0</p>
+              台次
+            </div>
+          </div>
+          <div class="operate-item">
+            <div>
+              今日到店
+              <p>0</p>
+              台次
+            </div>
+          </div>
+        </div>
+      </index-card>
+      <index-card title="客户数据" iconName="el-icon-user">
+        <div slot="content" style="height:17vh">1</div>
+      </index-card>
+      <index-card title="新闻公告" iconName="el-icon-s-fold">
+        <div slot="content" style="height:17vh">1</div>
+      </index-card>
+    </div>
+    <!-- <el-row>
       <el-col :span="12">
-         <index-card title="标题" iconName="el-icon-view"></index-card>
-        <!-- <el-row>
-          <el-col :span="6">
-            <div class="but-card">
-              <div>
-                <i class="el-icon-s-order"></i>
-              </div>
-              <div>
-                工单新建
+        <div class="home-brand">
+          <div>
+            <div class="index" style="padding:10px">
+              <div class="but-card">
+                <div class="content">
+                  <div class="icon">
+                    <i class="el-icon-folder-add "></i>
+                  </div>
+                  <div class="name">
+                    工单新建
+                  </div>
+                </div>
               </div>
             </div>
-          </el-col>
-          <el-col :span="6"> </el-col>
-          <el-col :span="6"> </el-col>
-        </el-row> -->
+          </div>
+        </div>
       </el-col>
       <el-col :span="12">
         <index-card title="今日工作看板" iconName="el-icon-view"></index-card>
@@ -40,13 +92,14 @@
       <el-col :span="12">
         <index-card title="新闻公告" iconName="el-icon-s-fold"></index-card>
       </el-col>
-    </el-row>
+    </el-row> -->
   </basic-container>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 import indexCard from "./components/card.vue";
+import butCard from "./components/butCard.vue";
 export default {
   name: "wel",
   data() {
@@ -56,7 +109,8 @@ export default {
     };
   },
   components: {
-    indexCard
+    indexCard,
+    butCard
   },
   computed: {
     ...mapGetters(["userInfo"])
@@ -68,12 +122,36 @@ export default {
   }
 };
 </script>
-
-<style>
-.el-font-size {
-  font-size: 14px;
+<style lang="scss" scoped>
+.container {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, 50%);
+  grid-template-rows: 40% 30% 30%;
+  height: 80vh;
+  .container-items {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, 20%);
+    grid-template-rows: repeat(auto-fill, 50%);
+    align-items: center;
+  }
 }
-.but-card{
-  background:#FF7D13;
+//今日营业
+.operate {
+  display: grid;
+  grid-template-rows: repeat(auto-fill, 33.33%);
+  .operate-item {
+    display: flex;
+    align-items: center;
+    div {
+      display: flex;
+      align-items: end;
+      font-size: 14px;
+    }
+    p {
+      font-size: 24px;
+      line-height: 24px;
+      margin: 0 4px !important;
+    }
+  }
 }
 </style>

src/views/workManagement/main-items/configuration/mainList.json → src/views/workManagement/main-items/configuration/detailsPage.json

@@ -10,7 +10,7 @@
   "searchMenuSpan": 6,
   "selection": false,
   "addBtn": false,
-  "viewBtn": true,
+  "viewBtn": false,
   "editBtn": true,
   "delBtn": true,
   "menuWidth": 220,

src/views/workManagement/main-items/detailsPage.vue

@@ -1,76 +1,88 @@
 <template>
-  <basic-container>
-    <el-form :model="form" ref="form" label-width="130px">
-      <el-row>
-        <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
-          <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-            <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-            <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
-            <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item>
-            <el-button type="primary" style="float: right" @click="onSubmit">生成账单</el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <avue-crud
-      ref="crud"
-      :data="data"
-      :option="optionTable"
-      :page.sync="page"
-      :table-loading="loading"
-      @row-del="rowDel"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @size-change="sizeChange"
-      @current-change="currentChange"
-      @search-change="searchChange"
-      @refresh-change="refreshChange"
-      @cell-dblclick="cellDblclick"
-      @on-load="getList"
-      @saveColumn="saveColumn"
-    >
-      <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="handleDelete">新增明细
+  <div class="borderless">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                   @click="backToList">返回列表
         </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="handleDelete">导 出
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="handleDelete">打 印
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="handleDelete">新 增
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="handleDelete">请 核
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
+      </div>
+    </div>
+    <div style="margin-top: 60px">
+      <basic-container>
+        <el-form :model="form" ref="form" label-width="130px">
+          <el-row>
+            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col>
+              <el-form-item>
+                <el-button type="info" style="float: right" @click="">生成账单</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </basic-container>
+      <basic-container>
+        <avue-crud
+          ref="crud"
+          :data="data"
+          :option="optionTable"
+          :page.sync="page"
+          :table-loading="loading"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          @search-change="searchChange"
+          @refresh-change="refreshChange"
+          @cell-dblclick="cellDblclick"
+          @on-load="getList"
+          @saveColumn="saveColumn"
+        >
+          <!--修改 直接在列表编辑-->
+          <template slot="menuLeft">
+            <el-button type="success"
+                       size="small"
+                       icon="el-icon-plus"
+                       plain
+                       @click="">新增明细
+            </el-button>
+            <el-button type="primary"
+                       size="small"
+                       icon="el-icon-arrow-right"
+                       plain
+                       @click="">导 出
+            </el-button>
+            <el-button type="primary"
+                       size="small"
+                       plain
+                       @click="">打 印
+            </el-button>
+            <el-button type="success"
+                       size="small"
+                       icon="el-icon-plus"
+                       plain
+                       @click="">新 增
+            </el-button>
+            <el-button type="info"
+                       size="small"
+                       plain
+                       @click="">请 核
+            </el-button>
+          </template>
+        </avue-crud>
+      </basic-container>
+    </div>
+  </div>
 </template>
 
 <script>
-  import option from "./configuration/mainList.json";
+  import option from "./configuration/detailsPage.json";
   export default {
     data() {
       return {
@@ -348,8 +360,35 @@
       saveColumn(row, column) {
         console.log(row, column);
       },
+      //返回主营项目列表
+      backToList(){
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: '/workManagement/main-items/list',
+          query: {}
+        });
+      }
     }
   };
 </script>
 
-<style></style>
+<style scoped lang="scss">
+  .customer-head {
+    position: fixed;
+    top: 105px;
+    width: 100%;
+    margin-left: -10px;
+    height: 62px;
+    background: #ffffff;
+    box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+    z-index: 999;
+  }
+
+  .customer-back {
+    cursor: pointer;
+    line-height: 62px;
+    font-size: 16px;
+    color: #323233;
+    font-weight: 400;
+  }
+</style>

src/views/workManagement/main-items/list.vue

@@ -6,6 +6,9 @@
       :option="optionTable"
       :page.sync="page"
       :table-loading="loading"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
       @size-change="sizeChange"
       @current-change="currentChange"
       @search-change="searchChange"
@@ -17,15 +20,15 @@
       <template slot="menuLeft">
         <el-button type="primary"
                    size="small"
-                   icon="el-icon-upload2"
+                   icon="el-icon-arrow-right"
                    plain
-                   @click="handleDelete">导 出
+                   @click="">导 出
         </el-button>
-        <el-button type="primary"
+        <el-button type="success"
                    size="small"
-                   icon="el-icon-upload2"
+                   icon="el-icon-plus"
                    plain
-                   @click="handleDelete">新 单
+                   @click="">新 单
         </el-button>
       </template>
     <template slot-scope="scope" slot="menu">
@@ -82,24 +85,18 @@ export default {
             label: "客户名称",
             prop: "prop3",
             search: true,
-            addDisplay: false,
-            editDisplay: false,
             overHidden: true,
             minWidth:'80'
           },
           {
             label: "应收金额",
             prop: "prop4",
-            addDisplay: false,
-            editDisplay: false,
             overHidden: true,
             minWidth:'80'
           },
           {
             label: "实收金额",
             prop: "prop5",
-            addDisplay: false,
-            editDisplay: false,
             overHidden: true,
             minWidth:'80'
           },
@@ -107,16 +104,12 @@ export default {
             label: "责任人",
             prop: "prop6",
             search: true,
-            addDisplay: false,
-            editDisplay: false,
             overHidden: true,
             minWidth:'80'
           },
           {
             label: "系统编号",
             prop: "prop7",
-            addDisplay: false,
-            editDisplay: false,
             overHidden: true,
             minWidth:'80'
           },
@@ -228,8 +221,36 @@ export default {
       this.page.currentPage = 1;
       this.getList();
     },
-    rowDel(row, index) {
-      this.$message.success("删除成功");
+    //删除列表后面的删除按钮触发触发(row, index, done)
+    rowDel(row, index, done) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        // 数据回调进行刷新
+        done(row);
+      });
+    },
+    //修改时的修改按钮点击触发
+    rowUpdate(row, index, done, loading) {
+      setTimeout(() => {
+        this.$message.success("修改成功");
+        loading();
+        done();
+      }, 1000);
+    },
+    //新增修改时保存触发
+    rowSave(row, done, loading) {
+      setTimeout(() => {
+        this.$message.success("保存成功");
+        loading();
+        done();
+      }, 1000);
     },
     cellDblclick(row, column, cell, event) {
       console.log(row, column, cell, event);

src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -10,8 +10,8 @@
   "searchMenuSpan": 6,
   "tree": true,
   "selection": true,
-  "viewBtn": true,
-  "editBtn": true,
+  "viewBtn": false,
+  "editBtn": false,
   "delBtn": false,
   "menuWidth": 220,
   "column": [

src/views/workManagement/receipt/settleAccounts.vue

@@ -19,9 +19,8 @@
                  ref="crud"
                  v-model="form"
                  :page.sync="page"
+                 :before-open="beforeOpen"
                  @row-del="rowDel"
-                 @row-update="rowUpdate"
-                 @row-save="rowSave"
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
@@ -32,26 +31,41 @@
         <template slot="menuLeft">
           <el-button type="primary"
                      size="small"
-                     icon="el-icon-upload2"
+                     icon="el-icon-arrow-right"
                      plain
-                     @click="handleDelete">导 出
+                     @click="">导 出
           </el-button>
           <el-button type="primary"
                      size="small"
-                     icon="el-icon-upload2"
                      plain
-                     @click="handleDelete">打 印
+                     @click="">打 印
           </el-button>
-          <el-button type="primary"
+          <el-button type="info"
                      size="small"
-                     icon="el-icon-upload2"
                      plain
-                     @click="handleDelete">请 核
+                     @click="">请 核
           </el-button>
         </template>
+        <template slot-scope="{row}" slot="querenshou">
+          <el-button type="primary"  size="small" @click="">结 算</el-button>
+        </template>
         <template slot-scope="scope" slot="menu">
           <el-button
             type="text"
+            icon="el-icon-view"
+            size="small"
+            @click.stop="beforeOpenPage(scope.row,scope.index)"
+          >查看
+          </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click.stop="editOpen(scope.row,scope.index)"
+          >编辑
+          </el-button>
+          <el-button
+            type="text"
             icon="el-icon-edit"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
@@ -201,6 +215,27 @@
 
     },
     methods: {
+      //新增时跳转页面
+      beforeOpen(row){
+        this.$router.push({
+          path: "/settleAccounts_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
+      //查看
+      beforeOpenPage(row){
+        this.$router.push({
+          path: "/settleAccounts_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
+      //修改
+      editOpen(row){
+        this.$router.push({
+          path: "/settleAccounts_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
       //删除列表后面的删除按钮触发触发(row, index, done)
       rowDel(row, index, done) {
         this.$confirm("确定将选择数据删除?", {
@@ -216,30 +251,6 @@
           done(row);
         });
       },
-      //修改时的修改按钮点击触发
-      rowUpdate(row, index, done, loading) {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done(row);
-      },
-      //新增修改时保存触发
-      rowSave(row, done, loading) {
-        setTimeout(() => {
-          this.$message.success("保存成功");
-          loading();
-          done();
-        }, 1000);
-      },
-      //新增子项触发
-      handleAdd(row) {
-        this.parentId = row.id;
-        const column = this.findObject(this.option.column, "parentId");
-        column.value = row.id;
-        column.addDisabled = true;
-        this.$refs.crud.rowAdd();
-      },
       //点击搜索按钮触发
       searchChange(params, done) {
         this.query = params;

src/views/workManagement/receipt/settleAccountsEdit.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="borderless">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                   @click="backToList">返回列表
+        </el-button>
+      </div>
+      <el-button
+        class="el-button--small-yh add-customer-btn"
+        type="primary"
+        @click=""
+      >{{form.id?'确认修改':'确认新增'}}
+      </el-button>
+    </div>
+    <div style="margin-top: 60px">
+      <basic-container>
+        <el-form :model="form" ref="form" label-width="130px">
+          <el-row>
+            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </basic-container>
+    </div>
+  </div>
+</template>
+
+<script>
+  import option from "./configuration/settleAccounts.json";
+  export default {
+    data() {
+      return {
+        loading: false,
+        form:{},
+        data: [],
+        //顶部from数据
+        basicData:
+          {
+          column: [
+            {
+              label: '服务项目',
+              prop: 'prop1',
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '收费建议',
+              prop: 'prop2',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '计价单位',
+              prop: 'prop3',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '数量',
+              prop: 'prop3',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '报价',
+              prop: 'prop4',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '合计金额',
+              prop: 'prop5',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '频率',
+              prop: 'prop6',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '提醒日',
+              prop: 'prop7',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '备注',
+              prop: 'prop8',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '任务部门',
+              prop: 'prop8',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '承做人',
+              prop: 'prop9',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '开始日期',
+              prop: 'prop10',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '需求完成日期',
+              prop: 'prop11',
+              type:'datetime',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '录入人',
+              prop: 'prop12',
+              type:'datetime',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '录入时间',
+              prop: 'prop13',
+              type:'select',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '最新修改人',
+              prop: 'prop8',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }
+          ],
+        },
+        page: {
+          currentPage: 1,
+          total: 0,
+          pageSize: 10
+        }
+      };
+    },
+    methods: {
+      //删除列表后面的删除按钮触发触发(row, index, done)
+      rowDel(row, index, done) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        });
+      },
+      //修改时的修改按钮点击触发
+      rowUpdate(row, index, done, loading) {
+        setTimeout(() => {
+          this.$message.success("修改成功");
+          loading();
+          done();
+        }, 1000);
+      },
+      //新增修改时保存触发
+      rowSave(row, done, loading) {
+        setTimeout(() => {
+          this.$message.success("保存成功");
+          loading();
+          done();
+        }, 1000);
+      },
+      getList() {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.data = [
+            {
+              prop1: "食品许可",
+              prop2: "500",
+              prop3: "次",
+              prop4: "1",
+              prop5: "1500",
+              prop6: "1500",
+              prop7: "年",
+              prop8: "202202-1-1",
+              prop9: "效率高",
+              prop10: "商务部",
+              prop11: "老周",
+              prop12: "2021-1-1",
+              prop13: "2021-1-1",
+              prop14: "LOL",
+              prop15: "2021-1-1",
+              prop16: "LOL",
+              prop17: "2021-1-1"
+            }
+          ];
+          this.page.total = 1;
+        }, 1000);
+      },
+      searchChange(params, done) {
+        this.getList(this.page, params);
+        done();
+      },
+      sizeChange(val) {
+        this.page.pageSize = val;
+        this.getList();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+        this.getList();
+      },
+      refreshChange() {
+        this.page.currentPage = 1;
+        this.getList();
+      },
+      cellDblclick(row, column, cell, event) {
+        console.log(row, column, cell, event);
+        this.$refs.crud.rowEdit(row);
+      },
+      saveColumn(row, column) {
+        console.log(row, column);
+      },
+      //返回主营项目列表
+      backToList(){
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: '/workManagement/receipt/settleAccounts',
+          query: {}
+        });
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+  .customer-head {
+    position: fixed;
+    top: 105px;
+    width: 100%;
+    margin-left: -10px;
+    height: 62px;
+    background: #ffffff;
+    box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+    z-index: 999;
+  }
+
+  .customer-back {
+    cursor: pointer;
+    line-height: 62px;
+    font-size: 16px;
+    color: #323233;
+    font-weight: 400;
+  }
+
+  .add-customer-btn {
+    position: fixed;
+    right: 36px;
+    top: 115px;
+  }
+</style>

src/views/workManagement/service-items/configuration/mainList.json

@@ -0,0 +1,206 @@
+{
+  "headerAlign": "center",
+  "align": "center",
+  "border": true,
+  "index": true,
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "tree": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 280,
+  "column": [
+    {
+      "label": "项目代码",
+      "prop": "aname",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入项目代码",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "项目名称",
+      "prop": "bname",
+      "search": true,
+      "index": 2,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入项目名称",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "客户名称",
+      "prop": "cname",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入客户名称",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "服务项目",
+      "prop": "dname",
+      "search": true,
+      "index": 4,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入服务项目",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "下单时间",
+      "prop": "ename",
+      "index": 5,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入下单时间",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "开始日期",
+      "prop": "fname",
+      "index": 6,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入开始日期",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "需求完成日期",
+      "prop": "gname",
+      "index": 7,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入需求完成日期",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "部门",
+      "prop": "hname",
+      "index": 8,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入部门",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "备注",
+      "prop": "iname",
+      "index": 9,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入备注",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "应收金额",
+      "prop": "jname",
+      "index": 10,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入应收金额",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "任务责任人",
+      "prop": "kname",
+      "index": 11,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入任务责任人",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "系统编号",
+      "prop": "cname",
+      "index": 12,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入系统编号",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "状态",
+      "prop": "cname",
+      "index": 13,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入状态",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "备注",
+      "prop": "cname",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入备注",
+          "trigger": "blur"
+        }
+      ]
+    }
+  ]
+}

src/views/workManagement/service-items/type.vue

@@ -21,67 +21,70 @@
 </template>
 
 <script>
+  import option from "./configuration/mainList.json";
+
 export default {
   data() {
     return {
       loading: false,
       data: [],
-      optionTable: {
-        align: "center",
-        menuAlign: "center",
-        height: window.innerHeight - 345,
-        searchMenuSpan: 12,
-        menuWidth:'140',
-        column: [
-          {
-            label: "类别名称",
-            prop: "name",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入类别名称",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true
-          },
-          {
-            label: "排序",
-            prop: "sort",
-            rules: [
-              {
-                required: true,
-                message: "请输入排序",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true
-          },
-          {
-            label: "状态",
-            prop: "status",
-            search: true,
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "创建人",
-            prop: "user",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "创建时间",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          }
-        ]
-      },
+      optionTable: option,
+      //   {
+      //   align: "center",
+      //   menuAlign: "center",
+      //   height: window.innerHeight - 345,
+      //   searchMenuSpan: 12,
+      //   menuWidth:'140',
+      //   column: [
+      //     {
+      //       label: "类别名称",
+      //       prop: "name",
+      //       search: true,
+      //       rules: [
+      //         {
+      //           required: true,
+      //           message: "请输入类别名称",
+      //           trigger: "blur"
+      //         }
+      //       ],
+      //       overHidden: true
+      //     },
+      //     {
+      //       label: "排序",
+      //       prop: "sort",
+      //       rules: [
+      //         {
+      //           required: true,
+      //           message: "请输入排序",
+      //           trigger: "blur"
+      //         }
+      //       ],
+      //       overHidden: true
+      //     },
+      //     {
+      //       label: "状态",
+      //       prop: "status",
+      //       search: true,
+      //       addDisplay: false,
+      //       editDisplay: false,
+      //       overHidden: true
+      //     },
+      //     {
+      //       label: "创建人",
+      //       prop: "user",
+      //       addDisplay: false,
+      //       editDisplay: false,
+      //       overHidden: true
+      //     },
+      //     {
+      //       label: "创建时间",
+      //       prop: "date",
+      //       addDisplay: false,
+      //       editDisplay: false,
+      //       overHidden: true
+      //     }
+      //   ]
+      // },
       page: {
         currentPage: 1,
         total: 0,

src/views/workManagement/task/configuration/mainList.json

@@ -10,8 +10,8 @@
   "searchMenuSpan": 6,
   "tree": true,
   "selection": true,
-  "viewBtn": true,
-  "editBtn": true,
+  "viewBtn": false,
+  "editBtn": false,
   "delBtn": false,
   "menuWidth": 280,
   "column": [

src/views/workManagement/task/index.vue

@@ -5,9 +5,8 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :before-open="beforeOpen"
                @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -21,7 +20,7 @@
                    size="small"
                    icon="el-icon-upload2"
                    plain
-                   @click="handleDelete">导 入
+                   @click="">导 入
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -29,14 +28,28 @@
           type="text"
           icon="el-icon-view"
           size="small"
-          @click.stop="beforeOpenPage(scope.row,scope.index)"
+          @click.stop="beforeOpenPage(scope.row)"
+        >查看
+        </el-button>
+        <el-button
+          type="text"
+          icon="el-icon-edit"
+          size="small"
+          @click.stop="editOpen(scope.row)"
+        >编辑
+        </el-button>
+        <el-button
+          type="text"
+          icon="el-icon-view"
+          size="small"
+          @click.stop=""
         >发送
         </el-button>
         <el-button
           type="text"
           icon="el-icon-edit"
           size="small"
-          @click.stop="editOpen(scope.row,scope.index)"
+          @click.stop=""
         >完工
         </el-button>
       </template>
@@ -68,6 +81,28 @@
 
     },
     methods: {
+      //新增
+      beforeOpen(row){
+        this.$router.push({
+          path: "/task_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
+      //查看
+      beforeOpenPage(row){
+        this.$router.push({
+          path: "/task_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
+      //修改
+      editOpen(row){
+        this.$router.push({
+          path: "/task_editPages",
+          query: {id: JSON.stringify(row.fwxm)},
+        });
+      },
+      //
       //删除列表后面的删除按钮触发触发(row, index, done)
       rowDel(row, index, done) {
         this.$confirm("确定将选择数据删除?", {
@@ -83,22 +118,7 @@
           done(row);
         });
       },
-      //修改时的修改按钮点击触发
-      rowUpdate(row, index, done, loading) {
-        setTimeout(() => {
-          this.$message.success("修改成功");
-          loading();
-          done();
-        }, 1000);
-      },
-      //新增修改时保存触发
-      rowSave(row, done, loading) {
-        setTimeout(() => {
-          this.$message.success("保存成功");
-          loading();
-          done();
-        }, 1000);
-      },
+
       //查询全部
       initData(){
         customerList().then(res => {

src/views/workManagement/task/taskEdit.vue

@@ -0,0 +1,327 @@
+<template>
+  <div class="borderless">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                   @click="backToList">返回列表
+        </el-button>
+      </div>
+      <el-button
+        class="el-button--small-yh add-customer-btn"
+        type="primary"
+        @click=""
+      >{{form.id?'确认修改':'确认新增'}}
+      </el-button>
+    </div>
+    <div style="margin-top: 60px">
+      <basic-container>
+        <el-form :model="form" ref="form" label-width="130px">
+          <el-row>
+            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </basic-container>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    data() {
+      return {
+        loading: false,
+        form:{},
+        data: [],
+        //顶部from数据
+        basicData:
+          {
+          column: [
+            {
+              label: '项目代码',
+              prop: 'prop1',
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '项目名称',
+              prop: 'prop2',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '服务项目',
+              prop: 'prop3',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '下单时间',
+              prop: 'prop3',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '开始日期',
+              prop: 'prop4',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '需求完成日期',
+              prop: 'prop5',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '部门',
+              prop: 'prop6',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '备注',
+              prop: 'prop7',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '应收金额',
+              prop: 'prop8',
+              data: [],
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '任务责任人',
+              prop: 'prop8',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '客户名称',
+              prop: 'prop9',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '系统编号',
+              prop: 'prop10',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '状态',
+              prop: 'prop11',
+              type:'datetime',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '备注',
+              prop: 'prop12',
+              type:'datetime',
+              rules: [
+                {
+                  required: true,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }
+          ],
+        },
+        page: {
+          currentPage: 1,
+          total: 0,
+          pageSize: 10
+        }
+      };
+    },
+    methods: {
+      //删除列表后面的删除按钮触发触发(row, index, done)
+      rowDel(row, index, done) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        });
+      },
+      //修改时的修改按钮点击触发
+      rowUpdate(row, index, done, loading) {
+        setTimeout(() => {
+          this.$message.success("修改成功");
+          loading();
+          done();
+        }, 1000);
+      },
+      //新增修改时保存触发
+      rowSave(row, done, loading) {
+        setTimeout(() => {
+          this.$message.success("保存成功");
+          loading();
+          done();
+        }, 1000);
+      },
+      getList() {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.data = [
+            {
+              prop1: "食品许可",
+              prop2: "500",
+              prop3: "次",
+              prop4: "1",
+              prop5: "1500",
+              prop6: "1500",
+              prop7: "年",
+              prop8: "202202-1-1",
+              prop9: "效率高",
+              prop10: "商务部",
+              prop11: "老周",
+              prop12: "2021-1-1",
+              prop13: "2021-1-1",
+              prop14: "LOL",
+              prop15: "2021-1-1",
+              prop16: "LOL",
+              prop17: "2021-1-1"
+            }
+          ];
+          this.page.total = 1;
+        }, 1000);
+      },
+      searchChange(params, done) {
+        this.getList(this.page, params);
+        done();
+      },
+      sizeChange(val) {
+        this.page.pageSize = val;
+        this.getList();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+        this.getList();
+      },
+      refreshChange() {
+        this.page.currentPage = 1;
+        this.getList();
+      },
+      cellDblclick(row, column, cell, event) {
+        console.log(row, column, cell, event);
+        this.$refs.crud.rowEdit(row);
+      },
+      saveColumn(row, column) {
+        console.log(row, column);
+      },
+      //返回主营项目列表
+      backToList(){
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: '/workManagement/task/index',
+          query: {}
+        });
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+  .customer-head {
+    position: fixed;
+    top: 105px;
+    width: 100%;
+    margin-left: -10px;
+    height: 62px;
+    background: #ffffff;
+    box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
+    z-index: 999;
+  }
+
+  .customer-back {
+    cursor: pointer;
+    line-height: 62px;
+    font-size: 16px;
+    color: #323233;
+    font-weight: 400;
+  }
+
+  .add-customer-btn {
+    position: fixed;
+    right: 36px;
+    top: 115px;
+  }
+</style>

vue.config.js

@@ -26,11 +26,11 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        // target: 'http://192.168.1.177',
+        target: 'http://192.168.1.177',
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.vip/api',
         // 打包地址
-        target: 'http://121.37.83.47:10004',
+        // target: 'http://121.37.83.47:10004',
         ws: true,
         pathRewrite: {
           '^/api': '/'