Browse Source

代码更新

qymljy 2 years ago
parent
commit
827ea1f2b2

+ 1 - 1
src/Form/projectChange/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :disabled="!tool.checkAuth($route.name,'update') || !data.disabled"  @click="editBtn" :type="!tool.checkAuth($route.name,'update') || !data.disabled ? '':'primary'">编 辑</el-button>
+    <el-button size="mini" :disabled="!tool.checkAuth($route.name,'update') || !data.disabled || data.status === '已失败'"  @click="editBtn" :type="!tool.checkAuth($route.name,'update') || !data.disabled || data.status === '已失败'? '':'primary'">编 辑</el-button>
     <el-drawer
         title="编辑项目商机"
         :visible.sync="dialogFormVisible"

+ 2 - 2
src/HDrpManagement/projectChange/components/del.vue

@@ -1,6 +1,6 @@
 <template>
   <div >
-    <el-button slot="reference" :type="!disabled?'':'primary'" size="mini" :disabled="!disabled" @click="dialogTableVisible=true" >作 废</el-button>
+    <el-button slot="reference" :type="!disabled ?'':'primary'" size="mini" :disabled="!disabled " @click="dialogTableVisible=true" >作 废</el-button>
     <el-dialog title="作废项目" append-to-body :visible.sync="dialogTableVisible" width="25%">
       <el-row :gutter="20">
         <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
@@ -42,7 +42,7 @@ export default {
       }
     }
   },
-  props: ['id',"disabled"],
+  props: ['id',"disabled","rowData"],
   methods: {
     async submit() {
       this.form.sa_projectids = [this.id]

+ 7 - 7
src/HDrpManagement/projectChange/components/putPeople.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <div v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" class="inline-16">
-      <el-button  size="mini" :type="!disabled?'':'primary'" slot="reference" @click="onSubmit" :disabled="!disabled">提交报备</el-button>
+    <div v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" >
+      <el-button  size="mini" :type="!disabled || rowData.status === '已失败' ?'':'primary'" slot="reference" @click="onSubmit" :disabled="!disabled || rowData.status === '已失败'">提交报备</el-button>
     </div>
-    <div v-else-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" class="inline-16">
-      <el-button size="mini" :type="!disabled?'':'primary'" :disabled="!disabled" slot="reference" @click="onCheck" >报备审核</el-button>
+    <div v-else-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" >
+      <el-button size="mini" type="primary" slot="reference" @click="onCheck" >报备审核</el-button>
     </div>
-    <div v-if="flag !== 0 && tool.checkAuth($route.name,'putBack') " class="inline-16">
-      <el-button size="mini" :type="!disabled?'':'primary'" slot="reference" :disabled="!disabled" @click="onUnCheck" >报备驳回(退回)</el-button>
+    <div v-if="flag !== 0 && tool.checkAuth($route.name,'putBack') " >
+      <el-button size="mini" type="primary" slot="reference"  @click="onUnCheck" >报备驳回(退回)</el-button>
     </div>
 
   </div>
@@ -135,7 +135,7 @@ export default {
   },
   mounted() {
     this.flag = this.flagTag
-    console.log("报备状态",this.flagTag)
+    console.log("报备状态",this.flagTag,this.flag)
   },
   created() {
   }

+ 2 - 2
src/HDrpManagement/projectChange/components/recovery.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button  size="mini" :type="!disabled?'':'primary'" slot="reference" @click="onRecovery" :disabled="!disabled">恢 复</el-button>
+    <el-button  size="mini" :type="!disabled ?'':'primary'" slot="reference" @click="onRecovery" :disabled="!disabled ">恢 复</el-button>
   </div>
 </template>
 
 <script>
 export default {
   name: "recovery",
-  props:["disabled"],
+  props:["disabled","rowData"],
   methods:{
     onRecovery() {
       this.$confirm('确定恢复当前项目嘛?', '提示', {

+ 5 - 5
src/HDrpManagement/projectChange/modules/detail.vue

@@ -16,17 +16,17 @@
 <!--    <tagPanl slot="tags" :data="tagObj" ownertable="sa_project" :id="mainData.sa_projectid" @onSuccess="queryMainData"/>-->
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
-      <div  style="display: inline-block !important;">
+      <div class="inline-16" >
         <putPeople @putSuccess="putSuccess" v-if="flagTag !== ''" :rowData="mainData" :flagTag="flagTag" :disabled="mainData.disabled" style="width:100%;"/>
       </div>
-      <div class="inline-16">
+      <div class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status === '跟进中'">
         <finish v-if="tool.checkAuth($route.name,'finish')  && mainData.status === '跟进中'" :disabled="mainData.disabled" @onFinish="onSuccess"></finish>
       </div>
       <div class="inline-16">
-        <Del :id="mainData.sa_projectid" :nameId="20221020144302" nameKey="sa_projectids" v-if="tool.checkAuth($route.name,'toVoid') " :disabled="mainData.disabled" @deleteSuccess="deleteSuccess"/>
+        <Del :id="mainData.sa_projectid" :nameId="20221020144302" :rowData="mainData" nameKey="sa_projectids" v-if="tool.checkAuth($route.name,'toVoid') " :disabled="mainData.disabled" @deleteSuccess="deleteSuccess"/>
       </div>
-      <div >
-        <recovery v-if="tool.checkAuth($route.name,'recovery')  && mainData.status === '已失败'" :disabled="mainData.disabled" @onRecovery="onSuccess"></recovery>
+      <div class="inline-16">
+        <recovery v-if="tool.checkAuth($route.name,'recovery')  && mainData.status === '已失败'" :rowData="mainData" :disabled="mainData.disabled" @onRecovery="onSuccess"></recovery>
       </div>
 
     </div>

+ 3 - 0
src/HDrpManagement/projectChange/modules/modules/rival/index.vue

@@ -18,6 +18,9 @@
         <div v-if="scope.column.columnname === 'important'">
           <span>{{scope.column.data[scope.column.columnname] === 1 ? '是' : '否'}}</span>
         </div>
+        <div v-if="scope.column.columnname === 'operation'">
+          <span></span>
+        </div>
         <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
       <template v-slot:opreation="scope">

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/rival/modules/add.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="关联竞争对手"
         :visible.sync="dialogFormVisible"
-        size="25%"
+        size="600px"
         direction="rtl"
         :show-close="false"
         append-to-body

+ 15 - 0
src/HDrpManagement/projectChange/modules/modules/rival/modules/edit.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <el-button size="mini" type="text">编 辑</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "edit"
+}
+</script>
+
+<style scoped>
+
+</style>

+ 15 - 0
src/HManagement/siteManage/securityConfig/components/contacts/add.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <el-button size="small" type="primary">新 建</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add"
+}
+</script>
+
+<style scoped>
+
+</style>

+ 59 - 0
src/HManagement/siteManage/securityConfig/components/contacts/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <div>
+      <add   class="inline-16" ></add>
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="search"
+          style="width:200px"
+          size="small"
+          class="input-with-select inline-16"
+          @keyup.native.enter="queryClick"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'operation'">
+            <span>{{scope.column.data[scope.column.columnname]}}</span>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+<!--          <edit  :data="scope.data" class="inline-16" @editSuccess="onSuccess" :disabled="data.disabled"></edit>
+          <delContact  :data="scope.data" @delSuccess="onSuccess" class="inline-16" :disabled="data.disabled"></delContact>-->
+        </template>
+      </tableLayout>
+    </div>
+    <div style="margin-top:16px;text-align:right">
+<!--      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import add from './add'
+export default {
+  name: "index",
+  components:{add},
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).contactsTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 64 - 30
src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -14,11 +14,43 @@
         @onEditSuccess="queryMainData($route.query.id)"
         :pageChange="true"
        >
-
+      <template #d_head>
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="5">
+              <el-form-item label="企业名称:" prop="enterprisename">
+                <el-input v-model="form.enterprisename" placeholder="企业名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="企业简称:" prop="abbreviation">
+                <el-input v-model="form.abbreviation" placeholder="企业简称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="法人:" prop="contact">
+                <el-input v-model="form.contact" placeholder="法人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div style="display:flex;align-items: center;">
+                <p class="inline-16">企业操作页LOGO:</p>
+                <uploadFile v-if="show" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sys_site',ownerid:siteinfo.siteuid,usetype:'actionlogo'}" @onSuccess="uploadSuccess"></uploadFile>
+                <div v-else class="image-panel">
+                  <i class="el-icon-error close-btn" @click="deleteFileLink"></i>
+                  <img v-show="img.usetype === 'actionlogo'" v-for="img in siteinfo.attinfos" :key="img.index" style="width:100%" :src="img.url" alt="">
+                </div>
+              </div>
+              <small style="display:block;margin-top:20px" class="info">注:建议上传图片大小1024x1024,大小不超过2M,格式为JPG/PNG</small>
+            </el-col>
+          </el-form>
+        </el-row>
+      </template>
       <div slot="customOperation" >
         <el-button type="warning" size="small">保存</el-button>
       </div>
       <div slot="slot0" >
+        <contacts></contacts>
       </div>
       <div slot="slot1" >
       </div>
@@ -30,9 +62,11 @@
 import {mapGetters} from 'vuex'
 
 import uploadFile from '../../../../components/upload/hw_obs_upload.vue'
+import contacts from '../components/contacts/index'
 export default {
   components:{
-    uploadFile
+    uploadFile,
+    contacts
   },
   computed:{
     ...mapGetters({
@@ -56,20 +90,23 @@ export default {
         enterprisename:[
           { required: true, message: '请输入企业名称', trigger: 'blur' },
         ],
-        sitename:[
+        abbreviation:[
+          { required: true, message: '请输入企业简称', trigger: 'blur' },
+        ],
+        contact:[
+          { required: true, message: '请输入法人', trigger: 'blur' },
+        ],
+        /*sitename:[
           { required: true, message: '请输入企业简称', trigger: 'blur' }
-        ]
+        ]*/
       },
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      basicInfo:{}
     }
   },
   methods:{
-    onShow () {
-      this.dialogEditVisible = true
-      this.form = Object.assign({},this.form,this.siteinfo)
-    },
     submit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
@@ -90,44 +127,41 @@ export default {
         "content": {
         }
       })
-      this.mainData = res.data
-      this.changeDataStructure()
-    },
-    changeDataStructure() {
-      this.mainAreaData = [
-        {
-          label:'企业名称',
-          value:this.mainData.enterprisename
-        },
-        {
-          label:'企业简称',
-          value:this.mainData.abbreviation
-        },
-        {
-          label:'法人',
-          value:this.mainData.contact
-        },
-      ]
+      this.form = Object.assign({},res.data,this.form)
     },
     async deleteFileLink (item) {
+      console.log(this.$route.query.basicInfo)
       const res = await this.$api.requested({
         "classname": "system.attachment.Attachment",
         "method": "deleteFileLink",
         "content": {
-          "linksids":[this.form.attinfos[0].linksid]
+          "linksids":[this.siteinfo.attinfos[0].linksid]
         }
       })
-      res.code === 1?this.$emit('onSuccess'):''
+      /*res.code === 1?this.$emit('onSuccess'):''*/
+      res.code === 1?this.queryImg():''
+
     },
     uploadSuccess () {
       this.$emit('onSuccess')
       setTimeout(() => {
         this.form = Object.assign({},this.form,this.siteinfo)
       }, 100);
+    },
+    async queryImg(){
+      const res = await this.$api.requested({
+        "classname": "webmanage.site.site",
+        "content": {},
+        "method": "querySite",
+       "systemappid": 21
+      })
+      this.show = true
     }
   },
   mounted() {
-    this.form = Object.assign({},this.form,this.siteinfo)
+   /* this.form = Object.assign({},this.form,this.siteinfo)*/
+    console.log(this.$route.query.basicInfo,'输出')
+    this.basicInfo = this.$route.query.basicInfo
     this.queryMainData()
   }
 }

+ 1 - 1
src/router/HDrpManagement.js

@@ -582,7 +582,7 @@ const HDrpManagement = [
     //       ast_nav: true,
     //       keeproute: true,
     //     },
-    //     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/promotion/modules/detail')
+    //     components: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/promotion/modules/detail')
     //   },
     // ]
   },

+ 1 - 1
src/router/HManagement.js

@@ -36,7 +36,7 @@ const HManagement = [
   //     title: '数据分析',
   //     ast_nav: true
   //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_ad/dataAnalysis/index.vue')
+  //   components: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_ad/dataAnalysis/index.vue')
   // },
    {
     path: '/archives_adclass',

+ 1 - 1
src/router/index.js

@@ -30,7 +30,7 @@ let routes = [
   {
     path: '/main',
     name: 'main',
-    // component: () => import(/* webpackChunkName: "about" */ '@/components/layout/index.vue'),
+    // components: () => import(/* webpackChunkName: "about" */ '@/components/layout/index.vue'),
     component: () => import(/* webpackChunkName: "about" */ '@/components/newLayout/index.vue'),
     redirect: '/home',
     children: [