Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/Form/projectManage/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 增</el-button>
+    <el-button size="mini" type="primary" @click="onShow(dialogFormVisible = true)">新 增</el-button>
     <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="500px">
       <div slot="title" style="font-size: 15px">
         新增模板
@@ -13,8 +13,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="项目类型" prop="projecttype">
-              <el-input v-model="form.projecttype" placeholder="项目类型"></el-input>
+            <el-form-item label="项目类型">
+              <el-select v-model="form.projecttype" style="width:100%">
+                <el-option v-for="item in sys_options" :key="item.index" :value="item.value" :label="item.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -41,6 +43,7 @@
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
 export default {
   name: "add",
   data(){
@@ -66,7 +69,15 @@ export default {
       }
     }
   },
+  computed:{
+    ...mapGetters({
+      sys_options:'sys_options'
+    })
+  },
   methods:{
+    onShow () {
+      this.$store.dispatch('optiontypeselect','projecttype')
+    },
     onSubmit(){
       console.log(this.form)
       this.$refs['form'].validate(async (valid) => {

src/Form/projectManage/add1.vue

@@ -0,0 +1,354 @@
+<template>
+  <div>
+    <el-button size="mini" type="primary" @click="onShow(dialogFormVisible = true)">新 增</el-button>
+    <el-drawer
+      title="我是标题"
+      :visible.sync="dialogStageVisible"
+      direction="rtl"
+      :modal="true"
+      :show-close="false"
+      :withHeader="false"
+      size="50%">
+      <div class="flex-align-center flex-between container" style="border-bottom:1px solid #f1f2f3">
+        <div style="font-size:20px">{{data.stagetempname}}</div>
+        <div>
+          <el-button type="primary" @click="saveStageData(dialogStageVisible = false)" size="small">确 定</el-button>
+          <el-button @click="dialogStageVisible = false" size="small">取 消</el-button>
+        </div>
+      </div>
+      <div class="container">
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <div>
+              <div class="flex-align-center flex-between normal-margin">
+                <p>项目阶段</p>
+                <div>
+                  <el-button size="mini" type="default" @click="addStage">添加阶段</el-button>
+                  <el-button size="mini" :disabled="stageData.sa_projstagetempStages.length === 1" type="default" @click="deleteStage">删除阶段</el-button>
+                </div>
+              </div>
+              <div 
+                v-for="(stage,index) in stageData.sa_projstagetempStages" 
+                :key="index" 
+                @click="(act_stageIndex = index,act_workIndex = null)"
+                @dragenter="dragenter($event, index,dragover,1000)"
+                @dragover="debounce($event, index)"
+                @dragstart="dragstart(index)"
+                draggable
+                >
+                <div class="stage__panel" :class="act_stageIndex === index?'active__stage':''">
+                  <!-- <div>
+                    {{stage.stagename}}
+                  </div> -->
+                  <div style="padding:0 10px;">
+                    <el-input
+                      class="input-new-tag"
+                      v-if="act_stageIndex === index && inputVisible"
+                      v-model="stage.stagename"
+                      ref="editTagInput"
+                      size="small"
+                      @keyup.enter.native="updateStage(stage)"
+                    >
+                    </el-input>
+                    <div v-else class="flex-align-center flex-between">
+                      <p class="button-new-tag" size="small" @click="(inputVisible = false)">{{stage.stagename}}</p>
+                      <i class="el-icon-edit" @click.stop="editStage(index)">编 辑</i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="15">
+            <div class="flex-align-center flex-between normal-margin">
+              <p>设置阶段任务</p>
+              <div>
+                <el-button size="mini" type="default" @click="addNewWork">添加工作</el-button>
+              </div>
+            </div>
+            <div style="height:calc(100vh - 141px);overflow-y:scroll">
+              <div class="work__panel"
+                :class="act_workIndex === windex?'active__work':''"
+                v-for="(work,windex) in stageData.sa_projstagetempStages[act_stageIndex].sa_projstagetempWorks" 
+                :key="windex"
+                @click="(act_workIndex = windex)">
+                  <div class="work__panel__operation">
+                    <i class="el-icon-s-claim" @click="updateWork(work)"></i>&emsp;
+                    <i class="el-icon-delete" @click="deleteWork(work)"></i>
+                  </div>
+                  <div style="margin-top:20px">
+                    <el-form class="demo-form-inline" label-position="right" label-width="80px">
+                      <el-form-item label="工作内容">
+                        <el-input v-model="work.workname" type="textarea" size="mini" :rows="3"></el-input>
+                      </el-form-item>
+                      <el-form-item label="分值">
+                        <el-input style="width:100px" class="normal-margin" v-model="work.score" size="small"></el-input>
+                      </el-form-item>
+                    </el-form>
+                  </div>
+              </div>
+            </div>
+            <!-- <div class="work__panel_add" @click="addNewWork()">
+              + 添加新工作内容
+            </div> -->
+          </el-col>
+        </el-row>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  data () {
+    return {
+      dialogStageVisible:false,
+      inputVisible:false,
+      act_stageIndex:0,
+      act_workIndex:null,
+      stageData: {
+        "sa_projstagetempid": this.data.sa_projstagetempid,
+        "stagetempname": this.data.stagetempname,
+        "remarks":this.data.remarks,
+        "projecttype": this.data.projecttype,
+        "isused": this.data.isused,
+        "locked":  this.data.locked,
+        "sa_projstagetempStages":[
+          {
+            "sa_projstagetemp_stageid": 0,
+            "stagename": "阶段一",
+            "remarks": "",
+            "sequence": 0,
+            "sa_projstagetempWorks": [
+              {   
+                "sa_projstagetemp_workid":0,
+                "workname": "工作一",
+                "remarks": "",
+                "sequence": 0,
+                "score": 1
+              }
+            ]
+          },
+
+        ]
+      },
+      inputValue:'',
+      dragIndex: '',
+      enterIndex: '',
+    }
+  },
+  methods:{
+    // 查询阶段数据
+    async getStageData() {
+      const res = await this.$api.requested({
+        "id": "20221019085904",
+        "content": {
+          "sa_projstagetempid":this.data.sa_projstagetempid
+        }
+      })
+      if (res.data.sa_projstagetempStages.length === 0) {
+        this.saveStageData()
+      } else {
+        res.data.sa_projstagetempStages.forEach((e,index) => {
+          e.sequence = index
+        });
+        this.stageData = Object.assign({},this.stageData,res.data)
+      }
+    },
+    onShow () {
+      this.dialogStageVisible = true
+      this.getStageData()
+    },
+    
+    // 保存完整数据
+    async saveStageData () {
+      const res = await this.$api.requested({
+        "id": "20221020084204",
+        "content":this.stageData
+      })
+      this.stageData = Object.assign({},this.stageData,res.data)
+    },
+    // 显示编辑阶段输入框
+    editStage (index) {
+      this.act_stageIndex = index
+      this.inputVisible = true
+    },
+    // 新增阶段
+    async addStage() {
+      let obj = {
+        "sa_projstagetempid":this.data.sa_projstagetempid,
+        "sa_projstagetemp_stageid": 0,
+        "stagename": '新阶段',
+        "remarks": "",
+        "sequence": this.stageData.sa_projstagetempStages.length,
+        "sa_projstagetempWorks": []
+      }
+      const res = await this.$api.requested({
+        "id": "20221019090104",
+        "content": obj
+      })
+      this.getStageData()
+    },
+    // 删除阶段
+    async deleteStage () {
+      let id = this.stageData.sa_projstagetempStages[this.act_stageIndex].sa_projstagetemp_stageid
+      const res = await this.$api.requested({
+        "id":"20221019090204",
+        "content": {
+            "sa_projstagetemp_stageids":[id]
+        }
+      })
+      this.act_stageIndex = 0
+      this.tool.showMessage(res,()=>{
+        this.getStageData()
+      })
+    },
+    // 更新阶段请求
+    async updateStage (stage) {
+      this.inputVisible = false
+      const res = await this.$api.requested({
+        "id": "20221019090104",
+        "content": stage
+      })
+      this.stageData = Object.assign({},this.stageData,res.data)
+    },
+    // 新增工作内容
+    addNewWork () {
+      let stage = this.stageData.sa_projstagetempStages[this.act_stageIndex].sa_projstagetempWorks
+      let obj = {
+        "workname": "新工作",
+        "remarks": "新工作内容",
+        "sequence": 1,
+        "score": 1,
+        "sa_projstagetemp_workid":0,
+        "sa_projstagetemp_stageid": this.stageData.sa_projstagetempStages[this.act_stageIndex].sa_projstagetemp_stageid,
+        "sa_projstagetempid":this.data.sa_projstagetempid,
+      }
+      stage.push(obj)
+      this.updateWork(obj)
+    },
+    // 更新工作内容
+    async updateWork (work) {
+      const res = await this.$api.requested({
+        "id": "20221019090504",
+        "content": work
+      })
+      this.stageData = Object.assign({},this.stageData,res.data)
+      this.tool.showMessage(res,()=>{
+
+      })
+    },
+    // 删除工作内容
+    async deleteWork (work) {
+      console.log(work)
+      let id = work.sa_projstagetemp_workid
+      const res = await this.$api.requested({
+        "id":"20221019090604",
+        "content": {
+          "sa_projstagetemp_workids":[id]
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.getStageData()
+      })
+    },
+
+    dragstart(index) {
+      this.dragIndex = index;
+    },
+    dragenter(e, index) {
+      e.preventDefault();
+      // 避免源对象触发自身的dragenter事件
+      if (this.dragIndex !== index) {
+        const source = this.stageData.sa_projstagetempStages[this.dragIndex];
+        this.stageData.sa_projstagetempStages.splice(this.dragIndex, 1);
+        this.stageData.sa_projstagetempStages.splice(index, 0, source);
+        // 排序变化后目标对象的索引变成源对象的索引
+        this.dragIndex = index;
+        this.stageData.sa_projstagetempStages.forEach((e,idx)=>{
+          e.sequence = idx
+        })
+        this.saveStageData()
+      }
+    },
+    debounce (event,index,fn,delay) {
+      let timerid
+      return function () {
+        clearTimeout(timerid)
+        timerid = setTimeout(fn(event,index),delay)
+      }
+    },
+    dragover(e, index) {
+      e.preventDefault();
+      console.log('end')
+    },
+
+  },
+  create () {
+    
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.stage__panel{
+  height: 42px;
+  line-height: 42px;
+  margin-bottom:10px;
+  text-align: center;
+  cursor: pointer;
+  background: #f1f2f3;
+  
+}
+.active__stage {
+  background: #3874f6;
+  color:#fff
+}
+.work__panel{
+  position: relative;
+  /* width:400px; */
+  padding:10px;
+  margin-bottom:10px;
+  border:2px solid #f1f2f3;
+  font-size:14px;
+  border-radius: 4px;
+  cursor: pointer;
+}
+.work__panel:hover{
+  border:2px dashed #3874f6;
+}
+.active__work{
+  margin-bottom:10px;
+  border:2px dashed #3874f6;
+}
+.work__panel__operation{
+  display: none;
+  position: absolute;
+  right:0px;
+  top:0px;
+  padding:2px 10px;
+  
+  background: #3874f6;
+  color:#fff;
+  z-index: 999;
+}
+.active__work > .work__panel__operation {
+  display: block;
+}
+.hide{
+  display: none;
+}
+.show{
+  display: block;
+}
+.button-new-tag{
+  flex:1;
+  text-align: left;
+}
+.sort-move {
+  transition: transform 0.3s;
+}
+</style>

src/Form/salerPrivatecustomer/add.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="dataToForm === '1'">
+  <div>
     <el-button size="mini" type="primary" @click="show">新 增</el-button>
     <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="900px">
       <div slot="title" style="font-size: 15px">

src/HDrpManagement/projectStage/modules/stageDetail copy.vue

@@ -12,7 +12,7 @@
       <div class="flex-align-center flex-between container" style="border-bottom:1px solid #f1f2f3">
         <div style="font-size:20px">模板</div>
         <div>
-          <el-button type="primary" @click="dialogStageVisible = false" size="small">确 定</el-button>
+          <el-button type="primary" @click="dialogStageVisible = false" size="small">保 存</el-button>
           <!-- <el-button @click="dialogStageVisible = false" size="small">取 消</el-button> -->
         </div>
       </div>

src/HDrpManagement/projectStage/modules/stageDetail.vue

@@ -13,7 +13,7 @@
         <div style="font-size:20px">{{data.stagetempname}}</div>
         <div>
           <el-button type="primary" @click="saveStageData(dialogStageVisible = false)" size="small">确 定</el-button>
-          <!-- <el-button @click="dialogStageVisible = false" size="small">取 消</el-button> -->
+          <el-button @click="dialogStageVisible = false" size="small">取 消</el-button>
         </div>
       </div>
       <div class="container">
@@ -236,8 +236,8 @@ export default {
       })
       this.stageData = Object.assign({},this.stageData,res.data)
       this.tool.showMessage(res,()=>{
-
       })
+      // this.getStageData()
     },
     // 删除工作内容
     async deleteWork (work) {

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -16,7 +16,7 @@
         <!-- 使用此插槽可不传[tags] -->
         <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
       </div>
-      <div slot="customOperation" style="float: right;margin-right: -90%" >
+      <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
         <el-popover
             placement="bottom"

src/components/normal-basic-layout/details/index.vue

@@ -20,8 +20,8 @@
         </div>
       </div>
       <div style="display:flex">
-        <slot name="customOperation"></slot>
         <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
+        <slot name="customOperation"></slot>
       </div>
     </div>
     <el-row :gutter="20">

src/components/normal-basic-layout/drawerDetail/index.vue

@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/components/normal-basic-layout/index.vue

@@ -2,8 +2,9 @@
   <div class="container">
     <div class="layout-header-panel container normal-panel">
       <div class="flex-align-center flex-between">
-        <div class="normal-margin">
-          <!-- <p>{{routerName}}</p> -->
+        <div class="normal-margin flex-align-center">
+          <p>{{routerName}}</p>
+          <slot name="titleRight"></slot>
         </div>
         <div class="normal-margin">
           <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>