Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into luckysheet

# Conflicts:
#	src/views/modules/base/smartExcel/cpts/excel-info.vue

.env.development

@@ -12,7 +12,7 @@ VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
 VUE_APP_BIPASS_API_SERVER =  /linkdata/linkdata-gateway/route
-
+VUE_APP_SOCKET_SERVER =  ws://219.146.91.110:30801/api
 # VUE_APP_NODE_ENV=dev_sdtdt
 VUE_APP_NODE_ENV=dev
 #项目根路径

.env.preview

@@ -1,6 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  http://120.27.18.76/api
 VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
+VUE_APP_SOCKET_SERVER =  ws://epmet-preview.elinkservice.cn/api
 VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=preview
 VUE_APP_PUBLIC_PATH=epmet-work-pc

.env.test

@@ -1,5 +1,6 @@
 NODE_ENV=test
 VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route
+VUE_APP_SOCKET_SERVER =  ws://epmet-test.elinkservice.cn/api
 VUE_APP_NODE_ENV=test
 VUE_APP_PUBLIC_PATH=epmet-work-pc

src/views/modules/base/smartExcel/cpts/excel-info.vue

@@ -37,7 +37,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="任务类型">
-                            <div>{{formData.type}}</div>
+                            <div>{{formData.type || '数据填报'}}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="16">
@@ -49,9 +49,7 @@
                         <el-form-item label="分发人员">
                             <div style="display: flex;flex-direction: row; align-items: center;">
                                 <div>{{formData.totalNum}}人</div>
-                                <el-button @click="oncClickInfo('info')" style="margin-left: 10px;"
-                                    type="text">查看接收人员名单</el-button>
-                                <el-button @click="oncClickInfo('adjust')" type="text">调整接受人员</el-button>
+                                <el-button @click="oncClickInfo('adjust')" type="text">调整接收人员</el-button>
                             </div>
                         </el-form-item>
                     </el-col>
@@ -106,7 +104,7 @@ import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
-            title:"调整接受人员",
+            title:"",
             taskId:"",
             showType:"",
             showPersonel:false,
@@ -136,7 +134,6 @@ export default {
         },
         handelPersonel() {
             this.showPersonel = false;
-            this.getDetail()
         },
         oncClickPersonel(){
             this.showType="adjust"
@@ -145,10 +142,10 @@ export default {
          oncClickInfo(value){
             this.taskId=this.formData.id
             this.showType=value
-            if (value=="info") {
-                this.title="查看接收人员名单"
-            }else if (value=="edit") {
-                      this.title="修改"
+            if (value=="adjust") {
+                this.title="调整接收人员名单"
+            }else if(value === 'edit'){
+                this.title = '修改'
             }
       
             this.showPersonel=true

src/views/modules/base/smartExcel/cpts/excel-view.vue

@@ -166,9 +166,9 @@ export default {
       options.gridKey = this.currentId;
       options.allowUpdate = true;
       options.container = 'luckysheet'
-      options.loadUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}`
-      options.updateUrl = `ws://219.146.91.110:30801/api/actual/base/ws/luckysheet/${this.currentId}/${id}`
-      options.loadSheetUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/loadSheets`
+      options.loadUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}`
+      options.updateUrl = `${process.env.VUE_APP_SOCKET_SERVER}/actual/base/ws/luckysheet/${this.currentId}/${id}`
+      options.loadSheetUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/loadSheets`
       window.luckysheet.create({
         ...options,
         hook: {

src/views/modules/base/smartExcel/filling.vue

@@ -36,7 +36,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="创建人" prop="createdBy">
-                            <el-select class="u-item-width-normal" v-model.trim="formData.createByName"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.createdBy"
                                 placeholder="请选择" size="small" clearable :disabled="manager">
                                 <el-option v-for="item in createdByArray" :key="item.staffId" :label="item.name"
                                     :value="item.staffId">

src/views/modules/base/smartExcel/index.vue

@@ -34,7 +34,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="创建人" prop="createdBy">
-              <el-select class="u-item-width-normal" v-model.trim="formData.createByName" placeholder="请选择" size="small"
+              <el-select class="u-item-width-normal" v-model.trim="formData.createdBy" placeholder="请选择" size="small"
                 clearable :disabled="manager">
                 <el-option v-for="item in createdByArray" :key="item.staffId" :label="item.name" :value="item.staffId">
                 </el-option>
@@ -304,6 +304,27 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
+   async handleDel(item){
+    let parms = {
+        id: item.id,
+      };
+      this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          requestPost('/actual/base/communityOneTablePublish/delete', parms).then(res => {
+            if (res.code == 0) {
+              this.getTableData()
+            }
+          })
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+          }
+        });
+    },
    async resetSearch() {
       this.$refs.ref_searchform.resetFields();
       this.pageNo = 1;