Browse Source

报价单复制

qymljy 2 years ago
parent
commit
f7fd7c7404

+ 584 - 0
src/Form/QuotedPrice/editCopy.vue

@@ -0,0 +1,584 @@
+<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.data,"报价单")
+      /*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>

+ 3 - 25
src/HDrpManagement/projectChange/modules/detail.vue

@@ -17,31 +17,10 @@
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
       <div  style="display: inline-block !important;">
-        <putPeople
-            @putSuccess="putSuccess"
-            v-if="flagTag !== ''"
-            :rowData="mainData"
-            :flagTag="flagTag"
-            style="width:100%;"
-        />
+        <putPeople @putSuccess="putSuccess" v-if="flagTag !== ''" :rowData="mainData" :flagTag="flagTag" style="width:100%;"/>
       </div>
-<!--      <div style="margin-right: 10px" class="inline-16">
-        <Check
-
-            @checkSuccess="queryMainData"
-            :rowData="mainData"
-            style="width:100%;"
-        />
-      </div>-->
-      <div >
-        <Del
-            :id="mainData.sa_projectid"
-            :nameId="20221020144302"
-            nameKey="sa_projectids"
-            class="inline-16"
-            v-if="tool.checkAuth($route.name,'delete') "
-            @deleteSuccess="deleteSuccess"
-        />
+      <div class="inline-16">
+        <Del :id="mainData.sa_projectid" :nameId="20221020144302" nameKey="sa_projectids" v-if="tool.checkAuth($route.name,'toVoid') " @deleteSuccess="deleteSuccess"/>
       </div>
     </div>
     <template #customBefore>
@@ -144,7 +123,6 @@ export default {
   },
   methods:{
     deleteSuccess(){
-      this.queryMainData(this.$route.query.id)
       this.$emit('onSuccess')
     },
     async queryMainData (id) {

+ 21 - 73
src/SDrpManagement/QuotedPrice/detail/components/copyTo.vue

@@ -1,45 +1,6 @@
 <template>
   <div>
-    <el-popover
-        placement="right"
-        width="800"
-        trigger="click"
-        v-model="historicalShow">
-      <el-table :data="historicalData" @row-click="historicalSelect">
-        <el-table-column width="150" property="billno" label="报价单号"></el-table-column>
-        <el-table-column width="260" property="enterprisename" label="客户"></el-table-column>
-        <el-table-column width="100" property="quotedpricetype" label="报价类型"></el-table-column>
-        <el-table-column width="150" property="projectnum" label="项目编号"></el-table-column>
-        <el-table-column width="200" property="projectname" label="项目名称"></el-table-column>
-        <el-table-column width="80" property="specialoffer" label="特价">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.specialoffer === 1?'是':'否' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column width="150" property="billdate" label="报价日期"></el-table-column>
-        <el-table-column width="300" property="begdate" label="有效期">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.begdate?scope.row.begdate + '至' + scope.row.enddate :'--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column width="90" property="status" label="状态"></el-table-column>
-        <el-table-column width="90" property="name" label="负责人"></el-table-column>
-        <el-table-column width="100" property="createby" label="创建人"></el-table-column>
-        <el-table-column width="190" property="createdate" label="创建日期"></el-table-column>
-      </el-table>
-      <div  class="container normal-panel" style="text-align:right">
-        <el-pagination
-            background
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10]"
-            layout="total,sizes, prev, pager, next, jumper"
-            :total="total">
-        </el-pagination>
-      </div>
-      <el-button slot="reference" size="mini" style="width:100%" type="primary" @click="listData">复 制</el-button>
-    </el-popover>
+      <el-button slot="reference" size="mini" style="width:100%" type="primary" @click="copyData">复 制</el-button>
   </div>
 </template>
 
@@ -53,6 +14,7 @@ export default {
       historicalShow:false,
       total:0,
       currentPage:0,
+      saQuotedPriceData:'',
       param:{
         "content": {
           "isExport": 0,
@@ -72,44 +34,30 @@ export default {
     }
   },
   methods:{
-    async listData(){
-      this.param.content.sa_quotedpriceid = this.data
-      const res = await this.$api.requested(this.param)
-      this.historicalData = res.data
-      this.total = res.total
-      this.currentPage = res.pageNumber
-      console.log(this.historicalData,"数据")
-    },
-    /*选择复制*/
-    historicalSelect(val){
-      console.log(val,"选择")
-      this.historicalShow = false
-
-      this.$router.replace({
-        path:'/quotedPriceCopy',
-        query:{
-          id:val.sa_quotedpriceid
-        }
-      })
-
-    },
-    /*/!*复制的内容*!/
-    async copyData(id){
+    async copyData(){
       const res = await this.$api.requested({
         "content": {
-          "sa_quotedpriceid":id
+          "sa_quotedpriceid":this.data
         },
         "id": 20221209094103,
       })
-      console.log(res,"复制的内容")
-      // this.$store.dispatch('changeDetailDrawer',true)
-      this.$router.replace({
-        path:'/quotedPriceCopy',
-        query:{
-          id:res.data.sa_quotedpriceid
-        }
-      })
-    },*/
+      this.saQuotedPriceData = res.data
+      this.copyList()
+    },
+    copyList(){
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        this.$router.replace({
+          path:'/quotedPriceCopy',
+          query:{
+            data:this.saQuotedPriceData
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+
+
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val

+ 29 - 14
src/SDrpManagement/QuotedPrice/detail/components/deApprove.vue

@@ -7,7 +7,7 @@
 <script>
 export default {
   name: "deApprove",
-  props:["sa_quotedpriceid"],
+  props:["data"],
   methods:{
     onShow() {
       this.$confirm('此操作将修改报价单的审核状态, 是否继续?', '提示', {
@@ -19,23 +19,38 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消反审'
+          message: '已取消反审核(退回)'
         });
       });
     },
     async onCheck(){
-      const res = await this.$api.requested({
-        "id": 20221020165403,
-        "version":1,
-        "content": {
-          "sa_quotedpriceid":this.sa_quotedpriceid,
-          "ischeck":false
-        }
-      })
-      this.tool.showMessage(res,()=>{
-        console.log(res)
-        this.$emit("onDeApprove")
-      })
+      if (this.data.status === '审核'){
+        const res = await this.$api.requested({
+          "id": 20221020165403,
+          "version":1,
+          "content": {
+            "sa_quotedpriceid":this.data.sa_quotedpriceid,
+            "ischeck":false
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          console.log(res)
+          this.$emit("onDeApprove")
+        })
+      }else {
+        const res = await this.$api.requested({
+          "id": 20221125162803,
+          "version":1,
+          "content": {
+            "sa_quotedpriceid":this.data.sa_quotedpriceid,
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          console.log(res)
+          this.$emit("onDeApprove")
+        })
+      }
+
     }
   }
 }

+ 12 - 1
src/SDrpManagement/QuotedPrice/detail/components/examineTo.vue

@@ -56,7 +56,18 @@ export default {
       })
     },
     onShow(){
-      this.draw = true
+      this.$confirm('是否通过该报价单的审核?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.CheckRow()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消审核'
+        });
+      });
     },
     breakShow(){
       this.draw = false

+ 1 - 1
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -25,7 +25,7 @@
         <toVoid class="inline-16" v-if="tool.checkAuth($route.name,'toVoid') && mainData.status === '新建'" :data="mainData.sa_quotedpriceid" ></toVoid>
         <copyTo class="inline-16" v-if="tool.checkAuth($route.name,'copyTo') && mainData.status === '新建'" :data="mainData.sa_quotedpriceid" ></copyTo>
         <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
-        <deApprove class="inline-16" v-if="tool.checkAuth($route.name,'deApprove') && mainData.status !== '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onDeApprove="onSuccess"></deApprove>
+        <deApprove class="inline-16" v-if="tool.checkAuth($route.name,'deApprove') && mainData.status !== '新建'" :data="mainData" @onDeApprove="onSuccess"></deApprove>
       </div>
       <div slot="slot1" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>

+ 21 - 11
src/SDrpManagement/QuotedPrice/detail/modules/historicalQuotation/index.vue

@@ -1,8 +1,13 @@
 <template>
   <div>
-    <tableLayout :layout="tablecols" :data="list" fixedName="">
-      <template v-slot:customcol="scope">
-        <div v-if="scope.column.columnname === 'specialoffer'">
+    <tableLayout :layout="tablecols" :data="list" fixedName="" :custom="true" >
+      <template v-slot:customcol="scope" >
+        <div v-if="scope.column.columnname === 'billno'" >
+            <el-button type="text" @click="detailGo(scope.column.data)">
+              {{scope.column.data[scope.column.columnname]}}
+            </el-button>
+        </div>
+        <div v-else-if="scope.column.columnname === 'specialoffer'" >
           <div v-if="scope.column.data.specialoffer === 0">
           </div>
@@ -69,14 +74,19 @@ export default {
   },
   methods:{
     detailGo(row){
-      console.log(row)
-      this.$router.replace({
-        path:'/quotedPriceDetail',
-        query:{
-          id:row.sa_quotedpriceid,
-          rowindex:row.rowindex
-        }
-      })
+      console.log(row,'输出')
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        this.$router.replace({
+          path:'/quotedPriceDetail',
+          query:{
+            id:row.sa_quotedpriceid,
+            rowindex:row.rowindex
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+
     },
     async listData(){
       this.param.content.sa_quotedpriceid = this.data.sa_quotedpriceid

+ 1 - 1
src/router/SDrpManagement.js

@@ -122,7 +122,7 @@ const SDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/QuotedPrice/components/copy/index')
+        component: () => import(/* webpackChunkName: "about" */ '@/Form/QuotedPrice/editCopy')
       },
     ]
   },