Selaa lähdekoodia

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

qymljy 3 vuotta sitten
vanhempi
commit
c837d25a9e

+ 585 - 0
src/Form/QuotedPrice/editCopy copy.vue

@@ -0,0 +1,585 @@
+<template>
+  <div>
+<!--    <el-button size="mini" :disabled="data.status !== '新建'"  :type="btnType?btnType:'text'"  @click="onShow" >编 辑</el-button>-->
+<!--    <el-button size="mini" :disabled="data.status !== '新建'"  :type="data.status === '新建'?primary:text"  @click="onShow" >编 辑</el-button>-->
+    <el-drawer
+        title="编辑报价单"
+        :visible.sync="drawer"
+        size="92%"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel" style="margin-bottom: 0px">
+        <el-row style="margin-top: 10px">
+          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+            <el-col :span="6">
+              <el-form-item label="报价类型:" label-width="90px" >
+                <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="6">
+              <el-form-item label="是否特价:" label-width="90px" >
+                <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="6" v-if="isQuotedPrice">
+              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+                <el-popover
+                    placement="bottom"
+                    width="580"
+                    trigger="click"
+                    v-model="projectShow"
+                    @show="projectList">
+                  <el-table :data="project.projectData">
+                    <el-table-column
+                        label="项目编号"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.projectnum?scope.row.projectnum:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="项目名称"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.projectname?scope.row.projectname:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="地址"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        fixed="right"
+                        label="操作"
+                        width="60">
+                      <template slot-scope="scope">
+                        <el-button type="text" @click="projectData(scope.row)" @focus="projectShow = true">选择</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeProject"
+                        @current-change="handleCurrentChangeProject"
+                        :current-page="project.currentPage"
+                        :total="project.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference"  v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" v-if="isQuotedPrice">
+              <el-form-item label="项目编号:" label-width="90px" >
+                <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
+                <el-popover
+                    placement="bottom"
+                    width="580"
+                    trigger="click"
+                    v-model="customerShow"
+                    @show="customerList">
+                  <el-table :data="customer.customerData">
+                    <el-table-column
+                        label="客户编号"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="客户名称"
+                        width="200">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                      </template>
+                    </el-table-column>
+<!--                    <el-table-column
+                        label="省市县"
+                        width="230">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.province?scope.row.province + '-' + scope.row.city + '-' + scope.row.county:'&#45;&#45;' }}</span>
+                      </template>
+                    </el-table-column>-->
+                    <el-table-column
+                        label="地址"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        fixed="right"
+                        label="操作"
+                        width="60">
+                      <template slot-scope="scope">
+                        <el-button type="text" @click="customerData(scope.row)" @focus="customerShow = true">选择</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeCustomer"
+                        @current-change="handleCurrentChangeCustomer"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="6">
+              <el-form-item label="报价日期:" label-width="90px">
+                <el-date-picker
+                    v-model="form.billdate"
+                    style="width: 100%"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="有效期:" label-width="90px" >
+                <el-date-picker
+                    v-model="date"
+                    style="width: 100%"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人:" label-width="90px" prop="contactsname">
+                <el-popover
+                    placement="bottom"
+                    width="580"
+                    trigger="click"
+                    v-model="contactsShow"
+                    @show="contactsList">
+                  <el-table :data="contacts.contactsData">
+                    <el-table-column
+                        label="姓名"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.name?scope.row.name:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="手机号"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="邮箱"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.email?scope.row.email:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="地址"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        fixed="right"
+                        label="操作"
+                        width="60">
+                      <template slot-scope="scope">
+                        <el-button type="text" @click="contactsData(scope.row)" @focus="contactsShow = true">选择</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeContacts"
+                        @current-change="handleCurrentChangeContacts"
+                        :current-page="contacts.currentPage"
+                        :total="contacts.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference"  v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="6">
+              <el-form-item label="手机号:" label-width="90px" >
+                <el-input  v-model="form.contactsphonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="6">
+              <el-form-item label="总金额:" label-width="90px" >
+                <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
+              </el-form-item>
+            </el-col>-->
+          </el-form>
+        </el-row>
+      </div>
+      <div >
+        <el-divider></el-divider>
+      </div>
+      <div style="margin:10px 20px 20px 20px">
+        <quotedPriceProduct :sa_quotedpriceid="form.sa_quotedpriceid" :sa_projectid="form.sa_projectid" :quotedpricetype="form.quotedpricetype" ref="quoterPrice" @checkForm="onSubmit" @productData="productDataChange"></quotedPriceProduct>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="getSubmit" class="normal-btn-width">保 存</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import quotedPriceProduct from '@/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct'
+export default {
+  name: "edit",
+  props:['btnType'],
+  components:{quotedPriceProduct},
+  data(){
+    return {
+      projectShow:false,
+      customerShow:false,
+      contactsShow:false,
+      data:'',
+      primary:'primary',
+      text:'',
+      projectParam:{
+        "id": 20221020143502,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 5,
+          "type":0, //  1:我负责的;2:我参与的;3:我下属负责的;4:我下属参与的
+          "where": {
+            "condition": "",
+            "startdate": "",
+            "enddate": "",
+            "status":"",//跟进中、已成交、已失败
+            "projecttype":"",
+            "stagename":"",
+            "tag":""
+          }
+        },
+      },
+      project:{
+        projectData:[],
+        total:0,
+        currentPage:0,
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 5,
+          "where": {
+            "condition": "",
+            "type":4,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
+      contactsParam:{
+        "id": "20221022165503",
+        "version": 1,
+        "content": {
+          "sys_enterpriseid":"",
+          "where": {
+            "condition": "",
+            "workaddress": 0//0表示人,1表示地址
+          }
+        }
+      },
+      contacts:{
+        contactsData:[],
+        total:0,
+        currentPage:0,
+      },
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() + 3600 * 1000 * 24 < Date.now() ;
+        },
+      },
+      drawer:true,
+      isQuotedPrice:false,
+      date:[],
+      form:{
+        quotedpricetype:'',
+        totalPrice:0,
+        type:'',
+        projectnum:'',
+        enterprisename:'',
+        name:'',
+        phonenumber:'',
+        specialOffer:'否',
+        sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
+        sys_enterpriseid: "",
+        contactsid:8,
+        sa_projectid: "0",
+        discountrate: 0,
+        remarks: "",
+        invaliddate: "",
+        projectname: "",
+        address: "",
+        billdate:"",
+        enddate:'',
+        begdate:''
+      },
+      rules:{
+        projectname:[
+          { required: true, message: '请选择项目', trigger: 'change'},
+        ],
+        enterprisename:[
+          { required: true, message: '请选择客户', trigger: 'change'},
+        ],
+        contactsname:[
+          { required: true, message: '请选择联系人', trigger: 'change'},
+        ]
+      },
+    }
+  },
+  methods:{
+    onShow(){
+      console.log('弹窗')
+      this.drawer = true
+      /*this.form = this.data*/
+      this.form = Object.assign({},this.form,this.data)
+      this.date[0] = this.form.begdate
+      this.date[1] = this.form.enddate
+      if (this.form.quotedpricetype === '项目报价'){
+        this.isQuotedPrice = true
+      }else {
+        this.isQuotedPrice = false
+      }
+      /*this.$nextTick(()=>{
+        this.$refs.quoterPrice.productData(this.data.sa_quotedpriceid)
+      })*/
+
+    },
+    onClose(){
+      this.drawer = false
+      this.$emit('onSuccess')
+    },
+    onSubmit(){
+      console.log(this.data,"点击添加商品")
+     if (this.data.length !== 0){
+       this.form.begdate = this.date[0]
+       this.form.enddate = this.date[1]
+     }else {
+       this.form.begdate = ''
+       this.form.enddate = ''
+     }
+      console.log(this.form,"表单")
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221020164803,
+          "version":1,
+          "content": this.form
+        })
+        console.log(res,"报价单id一")
+        /*this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,res.data.quotedpricetype)*/
+      })
+    },
+    getSubmit(){
+      console.log(this.data)
+      if (this.date.length === 0){
+        this.form.begdate = ''
+        this.form.enddate = ''
+      }else {
+        this.form.begdate = this.date[0]
+        this.form.enddate = this.date[1]
+      }
+      console.log(this.form,"表单")
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221020164803,
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,() => {
+          this.drawer = false
+          this.changeData(this.productObj)
+
+        })
+      })
+    },
+    /*修改后的产品数据*/
+    productDataChange(val){
+      console.log(val,"修改后的产品数据")
+      let obj = val.map(e=>{
+        return {
+          sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
+          itemid:e.itemid,
+          oldprice:e.marketprice,
+          price:e.price,
+          discountrate:(e.discountrate/100).toFixed(4),
+          qty:e.qty
+        }
+      })
+      this.productObj = obj
+    },
+    async changeData(obj){
+      console.log(this.productObj,"数据")
+      const res = await this.$api.requested({
+        "id": 20221021095403,
+        "content": {
+          "sa_quotedpriceid":this.form.sa_quotedpriceid,     //sat_notice_classid<=0时 为新增
+          "items":obj
+        }
+      })
+      console.log(res)
+      this.$emit('onSuccess')
+    },
+    /*刷新总金额*/
+    queryTotalPrice(val){
+      console.log("总金额",val)
+      this.form.totalPrice = val
+      console.log(this.form)
+    },
+    async projectList(){
+      const res = await this.$api.requested(this.projectParam)
+      console.log(res)
+      this.project.projectData = res.data
+      this.project.total = res.total
+      this.project.currentPage = res.pageNumber
+    },
+    async selectProject(){
+      console.log(this.form.projectname)
+      this.projectShow = true
+      this.projectParam.content.where.condition = this.form.projectname
+      this.projectList()
+    },
+    async customerList(){
+      if (this.form.quotedpricetype === '客户报价'){
+        this.customerParam.content.where.sa_projectid = 0
+        this.customerParam.content.where.type = 2
+      }else {
+        this.customerParam.content.where.type = 4
+        this.customerParam.content.where.sa_projectid = this.form.sa_projectid
+      }
+      const res = await this.$api.requested(this.customerParam)
+      this.customer.customerData = res.data
+      this.customer.total = res.total
+      this.customer.currentPage = res.pageNumber
+    },
+    selectCustomer(){
+      this.customerParam.content.where.condition = this.form.enterprisename
+      this.customerList()
+    },
+    async contactsList(){
+      this.contactsParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+      const res = await this.$api.requested(this.contactsParam)
+      this.contacts.contactsData = res.data
+      this.contacts.total = res.total
+      this.contacts.currentPage = res.pageNumber
+    },
+    selectContacts(){
+      this.contactsShow = true
+      this.contactsParam.content.where.condition = this.form.name
+      this.contactsList()
+    },
+    /*项目选择信息*/
+    projectData(val){
+      this.form.sa_projectid = val.sa_projectid
+      this.form.projectname = val.projectname
+      this.form.projectnum = val.projectnum
+      this.form.sys_enterpriseid = ''
+      this.form.enterprisename = ''
+      this.form.contactsid = ''
+      this.form.contactsname = ''
+      this.form.contactsphonenumber = ''
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.form.contactsid = ''
+      this.form.contactsname = ''
+      this.form.contactsphonenumber = ''
+    },
+    /*联系人选择信息*/
+    contactsData(val){
+      this.form.contactsid = val.contactsid
+      this.form.contactsname = val.name
+      this.form.contactsphonenumber = val.phonenumber
+    },
+    /*项目翻页*/
+    handleSizeChangeProject(val) {
+      // console.log(`每页 ${val} 条`);
+      this.projectParam.content.pageSize = val
+      this.projectList()
+    },
+    handleCurrentChangeProject(val) {
+      // console.log(`当前页: ${val}`);
+      this.projectParam.content.pageNumber = val
+      this.projectList()
+    },
+    /*客户翻页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.projectParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.projectParam.content.pageNumber = val
+      this.customerList()
+    },
+    /*联系人翻页*/
+    handleSizeChangeContacts(val) {
+      // console.log(`每页 ${val} 条`);
+      this.projectParam.content.pageSize = val
+      this.contactsList()
+    },
+    handleCurrentChangeContacts(val) {
+      // console.log(`当前页: ${val}`);
+      this.projectParam.content.pageNumber = val
+      this.contactsList()
+    },
+  },
+  mounted() {
+    this.onShow()
+  },
+  created() {
+
+    this.data = this.$route.query.data
+    /*this.drawer = true*/
+    console.log(this.data,"获取项目报价")
+    console.log(this.$route.query.data,"获取项目报价1111")
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 242 - 249
src/Form/QuotedPrice/editCopy.vue

@@ -1,256 +1,248 @@
 <template>
-  <div>
+  <div class="normal-panel">
+    <p class="normal-title container">编辑报价单</p>
 <!--    <el-button size="mini" :disabled="data.status !== '新建'"  :type="btnType?btnType:'text'"  @click="onShow" >编 辑</el-button>-->
 <!--    <el-button size="mini" :disabled="data.status !== '新建'"  :type="data.status === '新建'?primary:text"  @click="onShow" >编 辑</el-button>-->
-    <el-drawer
-        title="编辑报价单"
-        :visible.sync="drawer"
-        size="92%"
-        direction="rtl"
-        :show-close="false"
-        append-to-body
-        @close="onClose">
-      <div class="drawer__panel" style="margin-bottom: 0px">
-        <el-row style="margin-top: 10px">
-          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="6">
-              <el-form-item label="报价类型:" label-width="90px" >
-                <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col  :span="6">
-              <el-form-item label="是否特价:" label-width="90px" >
-                <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col  :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
-                <el-popover
-                    placement="bottom"
-                    width="580"
-                    trigger="click"
-                    v-model="projectShow"
-                    @show="projectList">
-                  <el-table :data="project.projectData">
-                    <el-table-column
-                        label="项目编号"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.projectnum?scope.row.projectnum:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="项目名称"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.projectname?scope.row.projectname:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="地址"
-                        width="300">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        fixed="right"
-                        label="操作"
-                        width="60">
-                      <template slot-scope="scope">
-                        <el-button type="text" @click="projectData(scope.row)" @focus="projectShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <div class="container normal-panel" style="text-align:right">
-                    <el-pagination
-                        background
-                        small
-                        @size-change="handleSizeChangeProject"
-                        @current-change="handleCurrentChangeProject"
-                        :current-page="project.currentPage"
-                        :total="project.total">
-                    </el-pagination>
-                  </div>
-                  <el-input slot="reference"  v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目编号:" label-width="90px" >
-                <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
-                <el-popover
-                    placement="bottom"
-                    width="580"
-                    trigger="click"
-                    v-model="customerShow"
-                    @show="customerList">
-                  <el-table :data="customer.customerData">
-                    <el-table-column
-                        label="客户编号"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="客户名称"
-                        width="200">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
-                      </template>
-                    </el-table-column>
+    <div class="drawer__panel" style="margin-bottom: 0px">
+      <el-row style="margin-top: 10px">
+        <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+          <el-col :span="6">
+            <el-form-item label="报价类型:" label-width="90px" >
+              <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="6">
+            <el-form-item label="是否特价:" label-width="90px" >
+              <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="6" v-if="isQuotedPrice">
+            <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+              <el-popover
+                  placement="bottom"
+                  width="580"
+                  trigger="click"
+                  v-model="projectShow"
+                  @show="projectList">
+                <el-table :data="project.projectData">
+                  <el-table-column
+                      label="项目编号"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.projectnum?scope.row.projectnum:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="项目名称"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.projectname?scope.row.projectname:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="地址"
+                      width="300">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      fixed="right"
+                      label="操作"
+                      width="60">
+                    <template slot-scope="scope">
+                      <el-button type="text" @click="projectData(scope.row)" @focus="projectShow = true">选择</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      background
+                      small
+                      @size-change="handleSizeChangeProject"
+                      @current-change="handleCurrentChangeProject"
+                      :current-page="project.currentPage"
+                      :total="project.total">
+                  </el-pagination>
+                </div>
+                <el-input slot="reference"  v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="isQuotedPrice">
+            <el-form-item label="项目编号:" label-width="90px" >
+              <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
+              <el-popover
+                  placement="bottom"
+                  width="580"
+                  trigger="click"
+                  v-model="customerShow"
+                  @show="customerList">
+                <el-table :data="customer.customerData">
+                  <el-table-column
+                      label="客户编号"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="客户名称"
+                      width="200">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                    </template>
+                  </el-table-column>
 <!--                    <el-table-column
-                        label="省市县"
-                        width="230">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.province?scope.row.province + '-' + scope.row.city + '-' + scope.row.county:'&#45;&#45;' }}</span>
-                      </template>
-                    </el-table-column>-->
-                    <el-table-column
-                        label="地址"
-                        width="300">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        fixed="right"
-                        label="操作"
-                        width="60">
-                      <template slot-scope="scope">
-                        <el-button type="text" @click="customerData(scope.row)" @focus="customerShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <div class="container normal-panel" style="text-align:right">
-                    <el-pagination
-                        background
-                        small
-                        @size-change="handleSizeChangeCustomer"
-                        @current-change="handleCurrentChangeCustomer"
-                        :current-page="customer.currentPage"
-                        :total="customer.total">
-                    </el-pagination>
-                  </div>
-                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col  :span="6">
-              <el-form-item label="报价日期:" label-width="90px">
-                <el-date-picker
-                    v-model="form.billdate"
-                    style="width: 100%"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="90px" >
-                <el-date-picker
-                    v-model="date"
-                    style="width: 100%"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系人:" label-width="90px" prop="contactsname">
-                <el-popover
-                    placement="bottom"
-                    width="580"
-                    trigger="click"
-                    v-model="contactsShow"
-                    @show="contactsList">
-                  <el-table :data="contacts.contactsData">
-                    <el-table-column
-                        label="姓名"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.name?scope.row.name:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="手机号"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="邮箱"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.email?scope.row.email:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="地址"
-                        width="300">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        fixed="right"
-                        label="操作"
-                        width="60">
-                      <template slot-scope="scope">
-                        <el-button type="text" @click="contactsData(scope.row)" @focus="contactsShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <div class="container normal-panel" style="text-align:right">
-                    <el-pagination
-                        background
-                        small
-                        @size-change="handleSizeChangeContacts"
-                        @current-change="handleCurrentChangeContacts"
-                        :current-page="contacts.currentPage"
-                        :total="contacts.total">
-                    </el-pagination>
-                  </div>
-                  <el-input slot="reference"  v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col  :span="6">
-              <el-form-item label="手机号:" label-width="90px" >
-                <el-input  v-model="form.contactsphonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
-              </el-form-item>
-            </el-col>
+                      label="省市县"
+                      width="230">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.province?scope.row.province + '-' + scope.row.city + '-' + scope.row.county:'&#45;&#45;' }}</span>
+                    </template>
+                  </el-table-column>-->
+                  <el-table-column
+                      label="地址"
+                      width="300">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      fixed="right"
+                      label="操作"
+                      width="60">
+                    <template slot-scope="scope">
+                      <el-button type="text" @click="customerData(scope.row)" @focus="customerShow = true">选择</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      background
+                      small
+                      @size-change="handleSizeChangeCustomer"
+                      @current-change="handleCurrentChangeCustomer"
+                      :current-page="customer.currentPage"
+                      :total="customer.total">
+                  </el-pagination>
+                </div>
+                <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="6">
+            <el-form-item label="报价日期:" label-width="90px">
+              <el-date-picker
+                  v-model="form.billdate"
+                  style="width: 100%"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                  :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效期:" label-width="90px" >
+              <el-date-picker
+                  v-model="date"
+                  style="width: 100%"
+                  type="daterange"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系人:" label-width="90px" prop="contactsname">
+              <el-popover
+                  placement="bottom"
+                  width="580"
+                  trigger="click"
+                  v-model="contactsShow"
+                  @show="contactsList">
+                <el-table :data="contacts.contactsData">
+                  <el-table-column
+                      label="姓名"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.name?scope.row.name:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="手机号"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="邮箱"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.email?scope.row.email:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="地址"
+                      width="300">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      fixed="right"
+                      label="操作"
+                      width="60">
+                    <template slot-scope="scope">
+                      <el-button type="text" @click="contactsData(scope.row)" @focus="contactsShow = true">选择</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      background
+                      small
+                      @size-change="handleSizeChangeContacts"
+                      @current-change="handleCurrentChangeContacts"
+                      :current-page="contacts.currentPage"
+                      :total="contacts.total">
+                  </el-pagination>
+                </div>
+                <el-input slot="reference"  v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="6">
+            <el-form-item label="手机号:" label-width="90px" >
+              <el-input  v-model="form.contactsphonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
+            </el-form-item>
+          </el-col>
 <!--            <el-col :span="6">
-              <el-form-item label="总金额:" label-width="90px" >
-                <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
-              </el-form-item>
-            </el-col>-->
-          </el-form>
-        </el-row>
-      </div>
-      <div >
-        <el-divider></el-divider>
-      </div>
-      <div style="margin:10px 20px 20px 20px">
-        <quotedPriceProduct :sa_quotedpriceid="form.sa_quotedpriceid" :sa_projectid="form.sa_projectid" :quotedpricetype="form.quotedpricetype" ref="quoterPrice" @checkForm="onSubmit" @productData="productDataChange"></quotedPriceProduct>
-      </div>
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="getSubmit" class="normal-btn-width">保 存</el-button>
-      </div>
-    </el-drawer>
+            <el-form-item label="总金额:" label-width="90px" >
+              <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
+            </el-form-item>
+          </el-col>-->
+        </el-form>
+      </el-row>
+    </div>
+    <div >
+      <el-divider></el-divider>
+    </div>
+    <div style="margin:10px 20px 20px 20px">
+      <quotedPriceProduct :sa_quotedpriceid="form.sa_quotedpriceid" :sa_projectid="form.sa_projectid" :quotedpricetype="form.quotedpricetype" ref="quoterPrice" @checkForm="onSubmit" @productData="productDataChange"></quotedPriceProduct>
+    </div>
+    <div class="fixed__btn__panel">
+      <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+      <el-button size="small" type="warning" @click="getSubmit" class="normal-btn-width">保 存</el-button>
+    </div>
   </div>
 </template>
 
@@ -368,7 +360,8 @@ export default {
   },
   methods:{
     onShow(){
-      console.log(this.data,"报价单")
+      console.log('弹窗')
+      this.drawer = true
       /*this.form = this.data*/
       this.form = Object.assign({},this.form,this.data)
       this.date[0] = this.form.begdate

+ 1 - 1
src/Form/publicCustomer/add.vue

@@ -9,7 +9,7 @@
         :show-close="false"
         :visible.sync="dialogFormVisible"
         @close="onClose"
-        size="30%">
+        size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">

+ 2 - 2
src/Form/publicCustomer/edit.vue

@@ -7,7 +7,7 @@
         title="编辑公海客户"
         :show-close="false"
         :visible.sync="dialogFormVisible"
-        size="30%">
+        size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
@@ -139,7 +139,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width inline-16">取 消</el-button>
         <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="warning" @click="onSave" class="normal-btn-width">保 存</el-button>
       </div>

+ 0 - 1
src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -258,7 +258,6 @@ export default {
       this.$emit('onSuccess')
     },
     receiveSuccess(){
-      this.$emit('onSuccess')
       this.$store.dispatch('changeDetailDrawer',false)
     }
   },

+ 1 - 1
src/HManagement/clueManage/clue_import/detailPage/modules/add copy.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="small" type="primary" @click="onShow">新 建</el-button>
-    <el-dialog title="编辑线索" append-to-body :visible.sync="dialogFormVisible" width="500px">
+    <el-dialog title="新建线索" append-to-body :visible.sync="dialogFormVisible" width="500px">
       <el-form :model="form" :rules="rule" ref="form" label-position="right" label-width="80px" size="small">
         <el-form-item label="客户姓名">
           <el-input v-model="form.name" autocomplete="off" placeholder="输入客户姓名"></el-input>

+ 2 - 2
src/HManagement/clueManage/clue_private/index.vue

@@ -16,8 +16,8 @@
       @listData="listdata"
     >
       <div slot="titleRight" style="display:flex;margin-left:10px">
-        <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution>
-        <distributionSaler v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distributionSaler>
+        <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distributionAgent')" @onSuccess="$refs.basicLayout.listData()"></distribution>
+        <distributionSaler v-if="tool.checkAuth($route.name,'distributionSaler')" @onSuccess="$refs.basicLayout.listData()"></distributionSaler>
       </div>
       <div slot="custom" style="display:flex">
         <div class="label_center" style="display:flex;margin-right:10px">

+ 1 - 1
src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" @click="onShow">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" size="30%">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" label-position="right" label-width="80px" size="small">

+ 1 - 1
src/HManagement/clueManage/clue_public/index.vue

@@ -19,7 +19,7 @@
     </div>
       <div slot="titleRight" style="display:flex;margin-left:10px">
         <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution>
-        <distributionSaler v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distributionSaler>
+        <distributionSaler v-if="tool.checkAuth($route.name,'distributionSaler')" @onSuccess="$refs.basicLayout.listData()"></distributionSaler>
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">

+ 1 - 1
src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" :type="type" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" size="40%">
+    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" size="40%">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rule" ref="form" label-position="right" label-width="80px" size="small">
           <el-form-item label="客户名称" prop="enterprisename">

+ 14 - 2
src/HManagement/clueManage/m_activity/modules/add.vue

@@ -1,12 +1,13 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="onShow">新 建</el-button>
+    <el-button type="primary" size="small" @click="onShow">新 建</el-button>
     <el-drawer
       title="新建活动"
       :visible.sync="drawer"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
           <el-form-item label="活动名称" prop="name">
@@ -120,6 +121,17 @@ export default {
         })
       });
     },
+    onClose () {
+      this.form = {
+        "sat_campaignid":0,
+        "name":"",
+        "director":"",
+        "address":"",
+        "type":"",
+        "begdate":"",
+        "enddate": ""
+      }
+    }
   }
 }
 

+ 1 - 20
src/SManagement/project_target/modules/components/projectAdd/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini"  type="primary" style="margin-bottom: 15px" @click="dialogTableVisible = true" :disabled="disabled">添加项目</el-button>
+    <el-button size="mini"  type="primary" @click="dialogTableVisible = true" :disabled="disabled">添加项目</el-button>
     <el-dialog
         title="添加项目"
         :visible.sync="dialogTableVisible"
@@ -94,23 +94,4 @@ export default {
   padding:5px 5px;
   margin-bottom:0px
 }
->>> .el-dialog__body {
-  padding: 0px 0px 10px;
-  color: #606266;
-  font-size: 14px;
-  word-break: break-all;
-}
->>> .el-dialog__header {
-  padding: 10px 10px 10px ;
-
-}
-.dialog-footer{
-  margin-top: 0px;
-  margin-bottom: 10px;
-}
->>> .el-dialog__title {
-  line-height: 24px;
-  font-size: 16px;
-  color: #303133;
-}
 </style>

+ 5 - 5
src/SManagement/project_target/modules/detailInfo.vue

@@ -28,8 +28,8 @@
     </div>
 
     <div slot="slot0">
-      <div>
-        <project_add :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
+      <div class="mt-10">
+        <project_add v-if="tool.checkAuth($route.name,'addProject')" :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
         <el-input  style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="params.content.where.condition" @keyup.native.enter="getprojectTargetList(params.content.pageNumber = 1)" @clear="getprojectTargetList(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
         </el-input>
       </div>
@@ -54,9 +54,9 @@
         </template>
 
         <template v-slot:opreation="scope">
-          <el-button type="text" size="mini" class="inline-16" @click="edit(scope.data)" v-if="editShow " :disabled="disable">编辑</el-button>
+          <el-button type="text" size="mini" class="inline-16" @click="edit(scope.data)" v-if="editShow && tool.checkAuth($route.name,'editProjectTask')" :disabled="disable">编辑</el-button>
           <el-button type="text" style="color: #e09a1a" size="mini" class="inline-16" v-if="saveShow && actindex === (scope.data.index + 1)" @click="save(scope.data)">保存</el-button>
-          <project_del class="inline-16" v-if="editShow " :data="scope.data" @onDel="onProjectSuccess" :disabled="disable"></project_del>
+          <project_del class="inline-16" v-if="editShow && tool.checkAuth($route.name,'deleteProject')" :data="scope.data" @onDel="onProjectSuccess" :disabled="disable"></project_del>
         </template>
       </tableLayout>
       <div>
@@ -97,7 +97,7 @@
 
 <script>
 import detail_information from './components/detailedInformation'
-import project_add from './components/projectAdd/index'
+import project_add from './components/projectAdd/index.vue'
 import project_del from './components/delProject'
 export default {
   components:{detail_information,project_add,project_del},

+ 2 - 2
src/SManagement/sales_forecast/modules/project.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex-align-center flex-between mt-10">
       <el-input style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
-      <addProject v-if="checkDateOut" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
+      <addProject v-if="checkDateOut && tool.checkAuth($route.name,'add_project')" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
     </div>
     <el-table
       :data="list"
@@ -30,7 +30,7 @@
         label="操作"
         width="150">
         <template slot-scope="scope">
-          <addProduct v-if="checkDateOut" class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
+          <addProduct v-if="checkDateOut && tool.checkAuth($route.name,'add_product')" class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
           <el-button size="small" type="text" :disabled="!checkDateOut" @click="deleteProject(scope.row)">删 除{{scope.row.sa_salesforecastid}}</el-button>
         </template>
       </el-table-column>

+ 6 - 4
src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -26,20 +26,22 @@ export default {
 
     }
   },
+  watch:{
+    closeDrawerTemp (val) {
+      val===false?this.$emit('onSuccess'):''
+    }
+  },
   methods:{
     closeDrawer (done) {
       this.$router.go(-1)
       
       this.$store.dispatch('changeDetailDrawer',false)
-
-      this.$emit('onSuccess')
     }
   },
   mounted () {
     var that = this
     window.addEventListener("popstate", function(e) {
-     that.$store.dispatch('changeDetailDrawer',false)
-     that.$emit('onSuccess')
+      that.$store.dispatch('changeDetailDrawer',false)
     }, false);
   }
 }

+ 3 - 4
src/components/normal-basic-layout/modules/cpAdd.vue

@@ -13,13 +13,12 @@ export default {
   },
   computed:{
 		formComponent () {
-      console.log(this.formPath,'formpath')
-      console.log(this.oldFormPath,'formpath')
       if (this.oldFormPath) {
         return ()=>import(`@/${this.oldFormPath.add}/add.vue`)
-        
-      } else {
+      } else if(this.formPath) {
         return ()=>import(`@/Form/${this.formPath}/add.vue`)
+      } else {
+        return false
       }
 		}
 	},