Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/basicData/basicFeesDesc.js

@@ -10,7 +10,7 @@ export function customerList(data) {
 }
 export const getDeptLazyTree = (parentId) => {
     return request({
-        url: '/api/blade-client/goodstype/lazy-tree',
+        url: '/api/blade-client/feestype/lazy-tree',
         method: 'get',
         params: {
             parentId

src/components/selectComponent/customerSelect.vue

@@ -1,11 +1,26 @@
 <template>
+  <span>
+    <el-select
+        v-model="value"
+        :placeholder="configuration.placeholder"
+        style="width: 80%;border-right: none"
+        :disabled="disabled?disabled:false"
+        :multiple="configuration.multiple?configuration.multiple:false"
+        :collapse-tags="configuration.collapseTags?configuration.collapseTags:false">
+      <el-option
+          v-for="item in configuration.dicData.length !== 0?configuration.dicData:dicData"
+          :key="item.id"
+          :label="item.cname"
+          :value="item.id"
+      />
+    </el-select>
+    <el-button icon="el-icon-edit" @click="dialogVisible = true" :disabled="disabled?disabled:false" style="width: 20%"></el-button>
   <el-dialog
       title="导入客户"
       :visible.sync="dialogVisible"
       class="el-dialogDeep"
       append-to-body
       width="80%">
-
     <el-row style="margin-top: -5px;height: 0">
       <el-col :span="5">
         <div class="box">
@@ -23,40 +38,14 @@
                      ref="crud"
                      v-model="form"
                      :page.sync="page"
-                     @row-del="rowDel"
-                     @row-update="rowUpdate"
                      :before-open="beforeOpen"
                      :before-close="beforeClose"
-                     @row-save="rowSave"
                      @search-change="searchChange"
                      @search-reset="searchReset"
                      @refresh-change="refreshChange"
                      @selection-change="selectionChange"
                      @on-load="onLoad"
                      @tree-load="treeLoad">
-            <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-delete"
-                  size="small"
-                  @click.stop="rowDel(scope.row,scope.index)"
-              >删除
-              </el-button>
-            </template>
           </avue-crud>
         </basic-container>
       </el-col>
@@ -66,6 +55,7 @@
       <el-button type="primary" @click="confirmSelection" :disabled="configuration.multipleChoices === true?false:selection.length === 1?false:true">确 定</el-button>
     </span>
   </el-dialog>
+  </span>
 </template>
 
 <script>
@@ -74,11 +64,21 @@ import {customerList, typeSave, deleteDetails, getDeptLazyTree} from "@/api/basi
 
 export default {
   name: "customerInformation",
-  props:['configuration'],
+  props:{
+    disabled:Boolean,
+    value:String,
+    configuration:Object,
+  },
+  model:{
+    prop:'value',
+    event:'returnBack'
+  },
   data() {
     return {
       form: {},
+      dicData:[],
       dialogVisible: false,
+      value:'',
       option: option,
       parentId: 0,
       dataList: [],
@@ -128,7 +128,19 @@ export default {
     },
     //确认导出触发
     confirmSelection(){
-      this.$emit('selectionChange',this.selection)
+      if (this.configuration.multipleChoices === true){
+        let value = []
+        for (let item in this.selection){
+          this.dicData.push({id:this.selection[item].id,cname:this.selection[item].cname})
+          value.push(this.selection[item].id)
+        }
+        this.value = value
+      }else {
+        this.dicData.push({id:this.selection[0].id,cname:this.selection[0].cname})
+        this.value = this.selection[0].id
+      }
+      this.selection = []
+      this.$emit('returnBack',this.value)
       this.dialogVisible = false
     },
     //选中触发
@@ -140,44 +152,6 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    //删除列表后面的删除按钮触发触发(row, index, done)
-    rowDel(row, index, done) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        return deleteDetails(row.id);
-      }).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId: 0});
-      });
-    },
-    //修改时的修改按钮点击触发
-    rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    //新增修改时保存触发
-    rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
-    },
     //查询全部
     initData() {
       customerList().then(res => {
@@ -194,13 +168,6 @@ export default {
       column.addDisabled = true;
       this.$refs.crud.rowAdd();
     },
-    //查看跳转页面
-    beforeOpenPage(row, index) {
-      this.$router.push({
-        path: "/detailsPageEdit",
-        query: {id: JSON.stringify(row.id)},
-      });
-    },
     //新增跳转页面
     beforeOpen(row, index) {
       this.$router.push({
@@ -208,12 +175,6 @@ export default {
         query: {id: JSON.stringify(row.id)},
       });
     },
-    editOpen(row, index) {
-      this.$router.push({
-        path: "/detailsPageEdit",
-        query: {id: JSON.stringify(row.id)},
-      });
-    },
     //点击新增时触发
     beforeClose(done) {
       this.parentId = "";

src/router/views/index.js

@@ -359,21 +359,6 @@ 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_detailsPage',

src/views/basicData/basicFeesDesc/configuration/mainList.json

@@ -42,6 +42,23 @@
       ]
     },
     {
+      "label": "费用类别",
+      "prop": "feesTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "addDisabled": false,
+      "multiple": true,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },
+    {
       "label": "币别",
       "prop": "fcyno",
       "search": true,
@@ -90,22 +107,6 @@
       ]
     },
     {
-      "label": "费用类别",
-      "prop": "feesTypeId",
-      "dicData": [],
-      "type": "tree",
-      "hide": true,
-      "addDisabled": false,
-      "multiple": true,
-      "props": {
-        "label": "title"
-      },
-      "rules": [{
-        "required": true,
-        "message": " ",
-        "trigger": "click"
-      }]
-    },{
       "label": "备注",
       "prop": "remarks",
       "index": 6,

src/views/basicData/basicFeesDesc/index.vue

@@ -152,7 +152,13 @@ export default {
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
-      console.log('1111')
+      if (["add"].includes(type)) {
+        this.option.column.forEach(e=>{
+          if(e.prop=='feesTypeId'){
+            this.$set(this.option.column,2,{...e,value:this.treeDeptId})
+          }
+        })
+      }
       if (["add", "edit"].includes(type)) {
         this.initData();
       }

src/views/basicData/commodityType/index.vue

@@ -534,6 +534,13 @@ export default {
     },
     //新增编辑查看触发
     async beforeOpen(done, type) {
+      if (["add"].includes(type)) {
+        this.option.column.forEach(e=>{
+          if(e.prop=='goodsTypeId'){
+            this.$set(this.option.column,2,{...e,value:this.treeDeptId})
+          }
+        })
+      }
       if (["edit", "view"].includes(type)) {
         await getUser(this.form.id).then(res => {
           this.form = res.data.data;

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -47,6 +47,7 @@
                   v-if="item.prop === 'corpsTypeId'"
                   leaf-only
                   multiple
+                  style="width: 100%;"
                   :props="{ label: 'title' }"
                   v-model="form[item.prop]"
                   placeholder="请选择内容"
@@ -494,6 +495,9 @@ export default {
         delete this.form.corpsBankList;
         delete this.form.corpsItems;
       });
+    }else{
+      //新增时根据左侧选中树结构给客户类别赋值
+      this.$set(this.form,"corpsTypeId", this.$route.query.treeDeptId)
     }
   },
   watch: {

src/views/basicData/customerInformation/index.vue

@@ -93,6 +93,7 @@ export default {
     return {
       reportQuery:{},
       switchDialog: false,
+      treeDeptId:"",
       form: {},
       option: option,
       parentId: 0,
@@ -213,7 +214,7 @@ export default {
     beforeOpen(row, index) {
       this.$router.push({
         path: "/detailsPageEdit",
-        query: { id: JSON.stringify(row.id) }
+        query: { id: JSON.stringify(row.id),treeDeptId:this.treeDeptId }
       });
     },
     editOpen(row, index) {

src/views/businessManagement/receipt/index.vue

@@ -65,7 +65,6 @@ export default {
     }
   },
   created() {
-    console.log('wangbadan')
     // this.onLoad()
   },
   methods: {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -22,13 +22,9 @@
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"-->
-                <!--                ></avue-input-tree>-->
                 <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-input v-else-if="item.prop === 'corpId'" disabled placeholder="请选择内容" v-model="form.corpName" class="input-with-select">
-                  <el-button slot="append" icon="el-icon-edit" @click="$refs.selectComponent.dialogVisible = true;this.customerDivide = 'corpId'" ></el-button>
-                </el-input>
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -41,9 +37,7 @@
               <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-input v-else-if="item.prop === 'belongToCorpId'" disabled placeholder="请选择内容" v-model="form.corpName" class="input-with-select">
-                  <el-button slot="append" icon="el-icon-edit" @click="$refs.selectComponent.dialogVisible = true;this.customerDivide = 'belongToCorpId'" ></el-button>
-                </el-input>
+                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="configuration"/>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -398,7 +392,6 @@
         </div>
       </div>
     </el-dialog>
-    <selectComponent :configuration="configuration" ref="selectComponent" @selectionChange="selectCustomer"></selectComponent>
   </div>
 </template>
 
@@ -429,7 +422,11 @@ export default {
     return {
       form: {},
       configuration:{
-        multipleChoices:false
+        multipleChoices:false,
+        multiple:false,
+        collapseTags:false,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
       },
       data: [],
       dataPolicy: [],
@@ -818,8 +815,8 @@ export default {
               }
             ]
           }, {
-            label: '到货地址',
-            prop: 'arrivalAddress',
+            label: '客户全称',
+            prop: 'corpId',
             rules: [
               {
                 required: true,
@@ -838,8 +835,8 @@ export default {
               }
             ]
           }, {
-            label: '客户全称',
-            prop: 'corpId',
+            label: '到货地址',
+            prop: 'arrivalAddress',
             rules: [
               {
                 required: true,
@@ -910,17 +907,6 @@ export default {
               }
             ]
           }, {
-            label: '信用证到期日',
-            type: 'datetime',
-            prop: 'creditDate',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
             label: "订单备注",
             span: 24,
             prop: "orderRemark",
@@ -963,17 +949,6 @@ export default {
     }
   },
   methods: {
-    //选择客户触发
-    selectCustomer(selection){
-      console.log(selection)
-      if (this.customerDivide = 'corpId'){
-        this.$set(this.form,"corpId",selection[0].id)
-        this.$set(this.form,"corpName",selection[0].cname)
-      }else if (this.customerDivide = 'belongToCorpId'){
-        this.$set(this.form,"belongToCorpId",selection[0].id)
-        this.$set(this.form,"belongToCorpName",selection[0].cname)
-      }
-    },
     //点击行可编辑
     handleRowClick(row, event, column) {
       console.log(row.$index)

src/views/exportTrade/purchaseContract/config/uploadList.json

@@ -1,6 +1,7 @@
 {
   "lazy": true,
   "tip": false,
+  "align": "center",
   "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
@@ -15,27 +16,28 @@
   "addBtnText": "上  传",
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
+      "label": "文件名称",
+      "prop": "fileName",
       "index": 1,
-      "width":100,
+      "width":340,
       "rules": [
         {
           "required": true,
-          "message": "请输入排序",
+          "message": "请输入文件名称",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "文件名称",
-      "prop": "fileName",
+    },
+    {
+      "label": "排序",
+      "prop": "sort",
+      "type": "number",
       "index": 2,
-      "width":100,
+      "width":150,
       "rules": [
         {
           "required": true,
-          "message": "请输入文件名称",
+          "message": "请输入排序",
           "trigger": "blur"
         }
       ]
@@ -43,7 +45,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 5,
-      "width":100,
+      "width":440,
       "rules": [
         {
           "required": false,

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

@@ -18,31 +18,31 @@
       "label": "服务项目",
       "prop": "cname",
       "index": 1,
-      "width": 100
+      "width": 120
     },
     {
       "label": "收费建议",
       "prop": "remarks",
       "index": 2,
-      "width": 100
+      "width": 150
     },
     {
       "label": "单价",
       "prop": "quantity",
       "index": 3,
-      "width": 100
+      "width": 120
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 4,
-      "width": 100
+      "width": 120
     },
     {
       "label": "数量",
       "prop": "quantity",
       "index": 5,
-      "width": 100,
+      "width": 120,
       "cell": true,
       "rules": [
         {
@@ -56,82 +56,86 @@
       "label": "合计金额",
       "prop": "amount",
       "index": 6,
-      "width": 100,
+      "width": 120,
       "cell": true
     },
     {
       "label": "频率",
       "prop": "frequency",
       "index": 7,
-      "width": 100,
+      "width": 120,
       "cell": true
     },
     {
       "label": "提醒日",
       "prop": "reminderDay",
-      "type": "datetime",
+      "type": "date",
       "index": 9,
-      "width": 100,
-      "cell": true
-    },
-    {
-      "label": "备注",
-      "prop": "feeRemarks",
-      "index": 10,
-      "width": 100,
+      "width": 150,
       "cell": true
     },
     {
       "label": "任务部门",
       "prop": "deptId",
+      "type":"tree",
+      "cell": true,
+      "slot": true,
       "index": 11,
-      "width": 100,
-      "cell": true
+      "width": 150
     },
     {
       "label": "承做人",
       "prop": "userId",
+      "slot": true,
       "index": 12,
-      "width": 100,
-      "cell": true
+      "width": 180
     },
     {
       "label": "需求开始日期",
       "prop": "beginTime",
+      "type": "date",
       "index": 13,
-      "width": 100,
+      "width": 150,
       "cell": true
     },
     {
       "label": "需求完成日期",
       "prop": "endTime",
+      "type": "date",
       "index": 14,
-      "width": 100,
+      "width": 150,
+      "cell": true
+    },
+    {
+      "label": "备注",
+      "prop": "feeRemarks",
+      "index": 10,
+      "width": 150,
       "cell": true
     },
     {
       "label": "制单人",
       "prop": "createUser",
       "index": 14,
-      "width": 80
+      "width": 120
     },
     {
       "label": "制单日期",
       "prop": "createUser",
       "index": 14,
-      "width": 120
+      "width": 150
     },
     {
       "label": "最新修改人",
       "prop": "updateUser",
       "index": 14,
-      "width": 80
+      "width": 120
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
       "index": 14,
-      "width": 120
+      "width": 150
     }
   ]
 }

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

@@ -19,90 +19,90 @@
       "label": "系统编号",
       "prop": "sysNo",
       "index": 1,
-      "width": 100
+      "width": 120
     },
     {
       "label": "项目编码",
       "prop": "code",
       "search": true,
       "index": 2,
-      "width": 100
+      "width": 120
     },
     {
       "label": "项目名称",
       "prop": "cname",
       "search": true,
       "index": 3,
-      "width": 100
+      "width": 120
     },
     {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 4,
-      "width": 100
+      "width": 120
     },
     {
       "label": "应收金额",
       "prop": "debitAmount",
       "index": 5,
-      "width": 100
+      "width": 120
     },
     {
       "label": "实收金额",
       "prop": "settlmentAmount",
       "index": 6,
-      "width": 100
+      "width": 120
     },
     {
       "label": "责任人",
       "prop": "corpAttn",
       "search": true,
       "index": 7,
-      "width": 100
+      "width": 120
     },
     {
       "label": "电话",
       "prop": "corpTel",
       "index": 8,
-      "width": 100
+      "width": 150
     },
     {
       "label": "状态",
       "prop": "status",
       "index": 9,
-      "width": 100
+      "width": 120
     },
     {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "index": 10,
-      "width": 100
+      "width": 150
     },
     {
       "label": "制单人",
       "prop": "createUser",
       "index": 11,
-      "width": 100
+      "width": 120
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 12,
-      "width": 100
+      "width": 150
     },
     {
       "label": "最新修改人",
       "prop": "updateUser",
       "index": 13,
-      "width": 100
+      "width": 120
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
       "index": 14,
-      "width": 100
+      "width": 150
     }
   ]
 }

src/views/workManagement/main-items/configuration/userList.json

@@ -0,0 +1,50 @@
+{
+    "lazy": true,
+    "tip": false,
+    "simplePage": true,
+    "searchMenuSpan": 12,
+    "dialogWidth": "60%",
+    "searchShowBtn": false,
+    "searchShow": true,
+    "menu": false,
+    "addBtn": false,
+    "tree": true,
+    "border": true,
+    "index": true,
+    "selection": true,
+    "viewBtn": false,
+    "editBtn": false,
+    "delBtn": false,
+    "menuWidth": 300,
+    "dialogClickModal": false,
+    "column":[
+        {
+            "label": "登录账号",
+            "prop": "account",
+            "search": true,
+            "index": 1,
+            "width":120
+        },{
+            "label": "所属租户",
+            "prop": "tenantName",
+            "index": 2,
+            "width":120
+        },{
+            "label": "用户姓名",
+            "prop": "realName",
+            "search": true,
+            "index": 4,
+            "width":150
+        },{
+            "label": "用户平台",
+            "prop": "userTypeName",
+            "index": 5,
+            "width":150
+        },{
+            "label": "用户拓展",
+            "prop": "userExt",
+            "index": 6,
+            "width":180
+        }
+    ]
+}

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

@@ -5,6 +5,9 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
+        <el-button class="el-button--small-yh add-customer-btn" type="primary"
+        >保存
+        </el-button>
       </div>
     </div>
     <div style="margin-top: 60px">
@@ -17,9 +20,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"/>
                 <el-date-picker v-else-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" size="small" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
                 <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
-                <el-input type="text" v-else-if="item.prop === 'prop5'" v-else v-model="form[item.prop]" size="small"  placeholder="请输入">
-                  <el-button slot="append" icon="el-icon-search" @click="customerDialog = true"></el-button>
-                </el-input>
+                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -39,9 +40,9 @@
           @row-save="rowSave"
           @size-change="sizeChange"
           @current-change="currentChange"
+          @selection-change="selectionChange"
           @search-change="searchChange"
           @refresh-change="refreshChange"
-          @cell-dblclick="cellDblclick"
           @on-load="getList"
           @saveColumn="saveColumn"
         >
@@ -52,27 +53,29 @@
                        plain
                        @click="serviceDialog = true">新增明细
             </el-button>
-            <el-button type="primary"
+            <el-button type="success"
                        size="small"
-                       icon="el-icon-arrow-right"
+                       icon="el-icon-plus"
                        plain
-                       @click="">导 出
+                       @click="">新 单
             </el-button>
-            <el-button type="primary"
+            <el-button type="info"
                        size="small"
                        plain
-                       @click="">打 印
+                       @click="">请 核
             </el-button>
-            <el-button type="success"
+          </template>
+          <template slot="menuRight">
+            <el-button type="primary"
                        size="small"
-                       icon="el-icon-plus"
+                       icon="el-icon-arrow-right"
                        plain
-                       @click="">新 单
+                       @click="">导 出
             </el-button>
-            <el-button type="info"
+            <el-button type="primary"
                        size="small"
                        plain
-                       @click="">请 核
+                       @click="">打 印
             </el-button>
           </template>
           <template slot-scope="{row,index}"  slot="menu">
@@ -82,14 +85,29 @@
               @click="rowCellTwo(row,index)"
             >{{row.$cellEdit?'保存':'修改'}}</el-button>
           </template>
+          <template slot="userId" slot-scope="{row,index}">
+            <span style="float: left;padding-top: 2px">{{ row.userId }}</span>
+            <el-button type="text" size="mini" style="float: right" @click="selectUser(row)">选择</el-button>
+          </template>
         </avue-crud>
       </basic-container>
+      <containerTitle title="附件上传"></containerTitle>
+      <basic-container style="margin-bottom: 40px">
+        <avue-crud
+          :option="upLoadOption"
+          v-model="upLoadForm"
+          :data="upLoadData"
+          @row-save="upLoadSave"
+          @row-update="upLoadUpdate"
+          @row-del="upLoadDel"
+        ></avue-crud>
+      </basic-container>
     </div>
     <el-dialog
-      title="选择客户"
+      title="导入服务项目"
       append-to-body
       class="el-dialogDeep"
-      :visible.sync="customerDialog"
+      :visible.sync="serviceDialog"
       width="70%"
       :close-on-click-modal="false"
       :destroy-on-close="true"
@@ -99,84 +117,87 @@
           <div>
             <el-scrollbar>
               <basic-container>
-                <avue-tree :option="customerTreeOption"  @node-click="customerNodeClick"/>
+                <avue-tree :option="serviceTreeOption"  @node-click="serviceNodeClick"/>
               </basic-container>
             </el-scrollbar>
           </div>
         </el-col>
         <el-col :span="19">
           <basic-container>
-            <avue-crud ref="customerCrud"
-                       :page.sync="customerPage"
-                       :search.sync="customerSearch"
-                       :option="customerOption"
-                       :table-loading="customerLoading"
-                       :data="customerData"
-                       @row-dblclick="customerConfirm"
-                       @refresh-change="customerRefreshChange"
-                       @selection-change="customerSelectionChange"
-                       @search-change="customerSearchChange"
-                       @on-load="customerOnLoad">
+            <avue-crud ref="serviceCrud"
+                       :page.sync="servicePage"
+                       :search.sync="serviceSearch"
+                       :option="serviceOption"
+                       :table-loading="serviceLoading"
+                       :data="serviceData"
+                       @refresh-change="serviceRefreshChange"
+                       @selection-change="serviceSelectionChange"
+                       @search-change="serviceSearchChange"
+                       @on-load="serviceOnLoad">
             </avue-crud>
           </basic-container>
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
-         <el-button type="primary" @click="customerConfirm('confirm')" :disabled="this.customerSelectList.length == 0||  this.customerSelectList.length >1">确 定</el-button>
-         <el-button @click="customerDialog = false">取 消</el-button>
+  <el-button type="primary" @click="serviceConfirm()" :disabled="this.serviceSelectList.length == 0">导 入</el-button>
+         <el-button @click="serviceDialog = false">取 消</el-button>
         </span>
     </el-dialog>
     <el-dialog
-      title="导入服务项目"
-      append-to-body
+      title="导入用户"
+      :visible.sync="userDialog"
       class="el-dialogDeep"
-      :visible.sync="serviceDialog"
-      width="70%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false">
-      <el-row style="height: 0;">
-        <el-col :span="5" >
-          <div>
+      append-to-body
+      width="80%">
+      <el-row style="margin-top: -5px;height: 0">
+        <el-col :span="5">
+          <div class="box">
             <el-scrollbar>
               <basic-container>
-                <avue-tree :option="serviceTreeOption"  @node-click="serviceNodeClick"/>
+                <avue-tree :option="userTreeOption" :data="userTreeData" @node-click="userNodeClick"/>
               </basic-container>
             </el-scrollbar>
           </div>
         </el-col>
         <el-col :span="19">
           <basic-container>
-            <avue-crud ref="customerCrud"
-                       :page.sync="servicePage"
-                       :search.sync="serviceSearch"
-                       :option="serviceOption"
-                       :table-loading="serviceLoading"
-                       :data="serviceData"
-                       @refresh-change="serviceRefreshChange"
-                       @selection-change="serviceSelectionChange"
-                       @search-change="serviceSearchChange"
-                       @on-load="serviceOnLoad">
+            <avue-crud ref="userCrud"
+                       :option="userOption"
+                       :data="userDataList"
+                       :table-loading="userLoading"
+                       :page.sync="userPage"
+                       v-model="userForm"
+                       @search-change="userSearchChange"
+                       @search-reset="userSearchReset"
+                       @refresh-change="userRefreshChange"
+                       @selection-change="userSelectionChange"
+                       @on-load="userOnLoad"
+            >
             </avue-crud>
           </basic-container>
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
-  <el-button type="primary" @click="serviceConfirm()" :disabled="this.serviceSelectList.length == 0">导 入</el-button>
-         <el-button @click="serviceDialog = false">取 消</el-button>
-        </span>
+      <el-button @click="userDialog = false">取 消</el-button>
+      <el-button type="primary" :disabled="this.userSelection.length == 1 ? false:true" @click="userConfirm" >确 定</el-button>
+    </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
   import option from "./configuration/detailsPage.json";
-  //客户列表接口
-  import {customerList, getDeptLazyTree} from "@/api/basicData/customerInformation"
-  import customerOption from "./configuration/customerDialogList.json";
+  //上传文件json
+  import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json"
   //服务列表接口
   import {getServiceProjectList,getServiceTypeTree,} from "@/api/workManagement/serviceProject";
   import serviceOption from "./configuration/serviceDialogList.json";
+  //任务部门树接口
+  import {getLazyList} from "@/api/system/dept";
+  //用户组件
+  import userOption from "./configuration/userList.json";
+  import { getList } from "@/api/system/user";
+  import { getDeptLazyTree} from "@/api/system/dept";
 
   export default {
     data() {
@@ -184,14 +205,30 @@
         loading: false,
         form:{},
         optionFrom:{},
-        data: [],
-        customerDialog:false,//客户名称窗口
+        data: [
+          {
+            deptId:'',
+            userId:''
+          }
+        ],
+        deptDicData:[],//任务部门数据
         serviceDialog:false,//服务导入窗口
+        userDialog:false,//用户导入窗口
+        //客户组件配置控制
+        configuration:{
+          multipleChoices:false,
+          multiple:true,
+          searchShow:true,
+          collapseTags:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
         page: {
           currentPage: 1,
           total: 0,
           pageSize: 10
         },
+        detailsSelect: {},
         //顶部from数据
         basicData: {
           column: [
@@ -298,7 +335,7 @@
               type:'select',
               dataType: "number",
               width: 120,
-              dicUrl: "/api/blade-system/dict/dictionary?code=payment_term",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
               props: {
                 label: "dictValue",
                 value: "dictKey"
@@ -316,46 +353,16 @@
             },
             {
               label: '备注',
+              span: 24,
               prop: 'remark'
             }
           ],
         },
         optionTable: option,
-        //客户窗口定义
-        customerTreeOption: {
-          nodeKey: 'id',
-          lazy: true,
-          treeLoad: function (node, resolve) {
-            const parentId = (node.level === 0) ? 0 : node.data.id;
-            getDeptLazyTree(parentId).then(res => {
-              resolve(res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren
-                }
-              }))
-            });
-          },
-          addBtn: false,
-          menu: false,
-          size: 'small',
-          props: {
-            labelText: '标题',
-            label: 'title',
-            value: 'value',
-            children: 'children'
-          }
-        },
-        customerOption:customerOption,
-        customerLoading:false,
-        customerData:[],
-        customerPage:{
-          currentPage: 1,
-          total: 0,
-          pageSize: 10},
-        customerSearch:{},
-        customerTreeDeptId:"",
-        customerSelectList:[],
+        //上传文件
+        upLoadOption: upLoadOption,
+        upLoadData:[],
+        upLoadForm:{},
         //服务窗口定义
         serviceTreeOption: {
           nodeKey: 'id',
@@ -394,10 +401,46 @@
         serviceSearch:{},
         serviceTreeDeptId:"",
         serviceSelectList:[],
+        //用户窗口定义
+        userTreeOption: {
+          nodeKey: 'id',
+          lazy: true,
+          treeLoad: function (node, resolve) {
+            const parentId = (node.level === 0) ? 0 : node.data.id;
+            getDeptLazyTree(parentId).then(res => {
+              resolve(res.data.data.map(item => {
+                return {
+                  ...item,
+                  leaf: !item.hasChildren
+                }
+              }))
+            });
+          },
+          addBtn: false,
+          menu: false,
+          size: 'small',
+          props: {
+            labelText: '标题',
+            label: 'title',
+            value: 'value',
+            children: 'children'
+          }
+        },
+        userTreeData:[],
+        userOption:userOption,
+        userLoading:false,
+        userDataList:[],
+        userSelection:"",
+        userTreeDeptId:"",
+        userForm:{},
+        userPage:{
+          currentPage: 1,
+          total: 0,
+          pageSize: 10
+        },
       };
     },
     mounted() {
-      option.height = window.innerHeight - 760 ;
     },
     methods: {
       //删除列表后面的删除按钮触发触发(row, index, done)
@@ -417,41 +460,22 @@
       },
       //点击修改或保存时触发
       rowCellTwo(row,index){
-        this.$refs.crud.rowCell(row, index)
+        if(row.$cellEdit){
+          setTimeout(() => {
+            this.$message.success("保存成功");
+          }, 1000);
+        }else{
+          this.$refs.crud.rowCell(row, index);
+        }
       },
       //新增修改时保存触发
       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);
       },
@@ -471,10 +495,6 @@
         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);
       },
@@ -486,38 +506,39 @@
           query: {}
         });
       },
-      //客户窗口事件
-      customerNodeClick(data) {
-        this.customerTreeDeptId = data.id;
-        this.customerOnLoad(this.customerPage);
-      },
-      customerRefreshChange(){
-        this.customerOnLoad(this.customerPage, this.customerSearch)
-      },
-      customerSearchChange(params, done){
-        this.customerOnLoad(this.customerPage, params)
-        done();
+      //上传文件保存
+      upLoadSave(row, done, loading){
+        this.upLoadData.push(row)
+        done()
       },
-      customerSelectionChange(row){
-        this.customerSelectList = row;
+      //修改附件上传触发
+      upLoadUpdate(row, done){
+        done(row);
       },
-      customerOnLoad(page, params = {parentId:0}) {
-        this.customerLoading = true;
-        let queryParams = Object.assign({}, params, {size: page.pageSize, current: page.currentPage,corpsTypeId:this.customerTreeDeptId})
-        customerList(queryParams).then(res => {
-          this.customerData = res.data.data.records
-          this.customerPage.total = res.data.data.total
-          this.customerLoading = false;
+      //删除附件上传触发
+      upLoadDel(row, index,){
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if (row.id){
+            corpsbank(row.id).then(res=>{
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              this.bankOfDepositData.splice(index, 1);
+            })
+          }else {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.bankOfDepositData.splice(index, 1);
+          }
         })
       },
-      customerConfirm(row){
-        if(row!='confirm'){
-          this.$set(this.form,"prop5",row.cname)
-        }else{
-          this.$set(this.form,"prop5",this.customerSelectList[0].cname)
-        }
-        this.customerDialog = false;
-      },
       //服务窗口事件
       serviceNodeClick(data) {
         this.serviceTreeDeptId = data.id;
@@ -554,6 +575,42 @@
         }
         this.serviceSelectList = []
         this.serviceDialog = false
+      },
+      //用户窗口事件
+      selectUser(row){
+        this.userDialog = true
+        this.detailsSelect = row.$index;
+      },
+      userSearchChange(params, done){
+        this.userOnLoad(this.userPage, params);
+        done()
+      },
+      userSearchReset(){
+
+      },
+      userRefreshChange(){
+        this.userOnLoad(this.userPage)
+      },
+      userSelectionChange(row){
+        this.userSelection = row;
+      },
+      userOnLoad(page,params={}){
+        this.userLoading = true;
+        getList(page.currentPage, page.pageSize, params, this.userTreeDeptId).then(res => {
+          this.userDataList = res.data.data.records
+          this.userPage.total = res.data.data.total
+          this.userLoading = false;
+        });
+      },
+      userNodeClick(data){
+        this.userTreeDeptId = data.id;
+        this.userOnLoad(this.userPage);
+      },
+      //确定
+      userConfirm(){
+         if(this.userSelection){
+           this.optionFrom[this.detailsSelect].userId = this.userSelection[0].userId;
+         }
       }
     },
   };
@@ -581,4 +638,9 @@
     overflow: hidden;
     max-height: 660px;
   }
+  .add-customer-btn {
+    position: fixed;
+    right: 36px;
+    top: 115px;
+  }
 </style>

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

@@ -14,7 +14,6 @@
       @current-change="currentChange"
       @search-change="searchChange"
       @refresh-change="refreshChange"
-      @cell-dblclick="cellDblclick"
       @on-load="getList"
       @saveColumn="saveColumn"
     >
@@ -58,6 +57,9 @@ export default {
       }
     };
   },
+  mounted() {
+    option.height = window.innerHeight - 350 ;
+  },
   methods: {
     getList() {
       this.loading = true;
@@ -145,10 +147,6 @@ export default {
         done();
       }, 1000);
     },
-    cellDblclick(row, column, cell, event) {
-      console.log(row, column, cell, event);
-      this.$refs.crud.rowEdit(row);
-    },
     saveColumn(row, column) {
       console.log(row, column);
     },

src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -72,13 +72,24 @@
           </template>
         </avue-crud>
       </basic-container>
+      <containerTitle title="附件上传"></containerTitle>
+      <basic-container style="margin-bottom: 40px">
+        <avue-crud
+          :option="upLoadOption"
+          v-model="upLoadForm"
+          :data="upLoadData"
+          @row-save="upLoadSave"
+          @row-update="upLoadUpdate"
+          @row-del="upLoadDel"
+        ></avue-crud>
+      </basic-container>
     </div>
   </div>
 </template>
 
 <script>
   import option from "./configuration/settleAccountsDetailsPage.json";
-  import {customerList, typeSave,detail,deleteDetails} from "@/api/basicData/customerCategory"
+  import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json";
 
   export default {
     name: "customerInformation",
@@ -98,63 +109,51 @@
           column: [
             {
               label: '系统编号',
-              prop: 'prop1',
+              prop: 'sysNo',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入系统编号',
                   trigger: 'blur'
                 }
               ]
             }, {
-              label: '项目代码',
-              prop: 'prop3',
-              data: [],
+              label: '项目编码',
+              prop: 'code',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入项目编码',
                   trigger: 'blur'
                 }
               ]
             }, {
               label: '项目名称',
-              prop: 'prop4',
+              prop: 'cname',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入项目名称',
                   trigger: 'blur'
                 }
               ]
             }, {
               label: '客户名称',
-              prop: 'prop5',
+              prop: 'corpId'
+            },{
+              label: '合同金额',
+              prop: 'debitAmount',
               rules: [
                 {
-                  required: true,
-                  message: ' ',
+                  pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
+                  message: '请输入数字或小数，且小数位不超过两位',
                   trigger: 'blur'
                 }
               ]
-            },{
-              label: '制单人',
-              prop: 'prop3',
-              data: []
-            }, {
-              label: '制单日期',
-              prop: 'prop2'
-            }, {
-              label: '责任人',
-              prop: 'prop6',
-              data: []
-            }, {
-              label: '承揽人',
-              prop: 'prop8',
-              data: []
-            }, {
-              label: '合同金额',
-              prop: 'prop8',
+            },
+            {
+              label: '首付金额',
+              prop: 'advanceAmount',
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -164,8 +163,8 @@
               ]
             },
             {
-              label: '应收金额',
-              prop: 'prop9',
+              label: '未收金额',
+              prop: 'balanceAmount',
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -175,8 +174,9 @@
               ]
             },
             {
-              label: '未收金额',
-              prop: 'prop10',
+              label: '已收金额',
+              prop: 'settlmentAmount',
+              disabled:true,
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -186,42 +186,50 @@
               ]
             },
             {
+              label: '责任人',
+              prop: 'corpAttn',
+            }, {
+              label: '承揽人',
+              prop: 'salesName',
+            },
+            {
+              label: '制单人',
+              prop: 'createUser',
+            }, {
+              label: '制单日期',
+              prop: 'createTime',
+              type: 'datetime'
+            },
+            {
+              label: '电话',
+              prop: 'corpTel',
+            },
+            {
               label: '收款方式',
-              prop: 'prop13',
+              prop: 'paymentType',
               type:'select',
               dataType: "number",
               width: 120,
-              dicUrl: "/api/blade-system/dict/dictionary?code=payment_term",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
               props: {
                 label: "dictValue",
                 value: "dictKey"
               },
-              rules: [
-                {
-                  required: true,
-                  message: '请选择收款方式',
-                  trigger: 'blur'
-                }
-              ],
             },
             {
               label: '开始日期',
-              prop: 'prop11',
-              type:'date',
+              prop: 'beginTime',
+              type:'datetime',
             },
             {
               label: '结束日期',
-              prop: 'prop12',
-              type:'date',
-            },
-            {
-              label: '电话',
-              prop: 'prop7',
-              data: [],
+              prop: 'endTime',
+              type:'datetime',
             },
             {
               label: '备注',
-              prop: 'prop8',
+              span: 24,
+              prop: 'remark'
             }
           ],
         },
@@ -259,14 +267,18 @@
             renwubu:"商务部",
             cnegzuoren:"小明",
           }
-        ]
+        ],
+        //上传文件
+        upLoadOption: upLoadOption,
+        upLoadData:[],
+        upLoadForm:{},
       }
     },
     created() {
 
     },
     mounted() {
-      option.height = window.innerHeight - 700 ;
+
     },
     methods: {
       backToList(){
@@ -349,6 +361,39 @@
         //   this.page.total = 1;
         // })
       },
+      //上传文件保存
+      upLoadSave(row, done, loading){
+        this.upLoadData.push(row)
+        done()
+      },
+      //修改附件上传触发
+      upLoadUpdate(row, done){
+        done(row);
+      },
+      //删除附件上传触发
+      upLoadDel(row, index,){
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if (row.id){
+            corpsbank(row.id).then(res=>{
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              this.bankOfDepositData.splice(index, 1);
+            })
+          }else {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.bankOfDepositData.splice(index, 1);
+          }
+        })
+      },
     }
   }
 </script>

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

@@ -6,7 +6,7 @@
   "lazy": true,
   "tip": false,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 12,
   "tree": true,
   "selection": true,
   "viewBtn": false,
@@ -65,9 +65,16 @@
     },
     {
       "label": "单价",
-      "prop": "Price",
+      "prop": "price",
       "index": 3,
-      "width": 120
+      "width": 120,
+      "rules": [
+        {
+          "pattern": "/^(([1-9][0-9]*)|(([0]\\.\\d{1,2}|[1-9][0-9]*\\.\\d{1,2})))$/",
+          "message":"请输入数字或小数，且小数位不超过两位",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "计价单位",
@@ -92,10 +99,16 @@
     },
     {
       "label": "标准工时",
-      "type": "number",
       "prop": "workingHours",
       "index": 7,
-      "width": 80
+      "width": 80,
+      "rules": [
+        {
+          "pattern": "/^(([1-9][0-9]*)|(([0]\\.\\d{1,2}|[1-9][0-9]*\\.\\d{1,2})))$/",
+          "message":"请输入数字或小数，且小数位不超过两位",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "创建人",

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

@@ -64,6 +64,7 @@ export default {
       search:{},
       treeDeptId:"",
       treeDeptName:'',
+      height: window.innerHeight - 350,
       page: {
         currentPage: 1,
         total: 0,
@@ -103,8 +104,6 @@ export default {
     getDeptTree().then(res => {
       this.findObject(this.tableOption.column, "goodsTypeId").dicData = res.data.data;
     });
-    // getDicData("payment_term").then(res =>{
-    // })
   },
   methods: {
     getList(page, params = {}) {
@@ -128,7 +127,6 @@ export default {
             this.$set(this.tableOption.column,2,{...e,value:this.treeDeptId})
           }
         })
-
       }
       if (["edit"].includes(type)) {
         detail(this.form.id).then(res => {
@@ -220,4 +218,5 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang="scss">
+</style>

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

@@ -9,10 +9,11 @@
   "searchMenuSpan": 6,
   "tree": true,
   "selection": true,
+  "addBtn": false,
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 280,
+  "menuWidth": 150,
   "column": [
     {
       "label": "项目代码",

src/views/workManagement/task/index.vue

@@ -13,14 +13,13 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
-               @on-load="onLoad"
-               @tree-load="treeLoad">
+               @on-load="onLoad">
       <template slot="menuLeft">
         <el-button type="primary"
                    size="small"
                    icon="el-icon-upload2"
                    plain
-                   @click="">导 入
+                   @click="">导 出
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -28,20 +27,6 @@
           type="text"
           icon="el-icon-view"
           size="small"
-          @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>
@@ -59,7 +44,6 @@
 
 <script>
   import option from "./configuration/mainList.json";
-  import {customerList, typeSave,detail,deleteDetails} from "@/api/basicData/customerCategory"
 
   export default {
     name: "customerInformation",
@@ -84,28 +68,6 @@
       option.height = window.innerHeight - 350 ;
     },
     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("确定将选择数据删除?", {
@@ -121,15 +83,6 @@
           done(row);
         });
       },
-
-      //查询全部
-      initData(){
-        customerList().then(res => {
-          console.log(this.form);
-          const column = this.findObject(this.option.column, "parentId");
-          column.dicData = res.data.data.records;
-        });
-      },
       //点击搜索按钮触发
       searchChange(params, done) {
         this.query = params;
@@ -186,13 +139,6 @@
           kname:"李",
         }];
       },
-      //树桩列点击展开触发
-      treeLoad(tree, treeNode, resolve) {
-        const parentId = tree.id;
-        customerList({parentId:parentId}).then(res => {
-          resolve(res.data.data.records);
-        });
-      },
     }
   }
 </script>

src/views/workManagement/task/taskEdit.vue

@@ -1,327 +0,0 @@
-<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,10 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        target: 'http://192.168.1.177',
-        //远程演示服务地址,可用于直接启动项目
-        // target: 'https://saber.bladex.vip/api',
+        target: 'http://192.168.1.177:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',
+        // target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'