暂存

src/Form/QuotedPrice/add.vue

@@ -1,7 +1,16 @@
 <template>
   <div>
+    <el-dropdown :hide-on-click="false" @command="handleCommand">
+      <span class="el-dropdown-link">
     <el-button size="small" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog
+  </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="项目报价">项目报价</el-dropdown-item>
+        <el-dropdown-item command="普通报价">普通报价</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+
+<!--    <el-dialog
         title="创建报价单"
         :visible.sync="dialogFormVisible"
         width="25%"
@@ -31,7 +40,7 @@
         <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary"  @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog>-->
     <projec_quotation_add :drawerShow="drawerShow" v-if="drawerShow" :typeData="type" @addSuccess="onSuccess"></projec_quotation_add>
   </div>
 </template>
@@ -63,13 +72,18 @@ export default {
       this.dialogFormVisible = false
       this.type = '项目报价'
     },
-    onSubmit(){
+    /*onSubmit(){
       this.dialogFormVisible = false
       this.drawerShow = true
-    },
+    },*/
     onSuccess(){
       this.drawerShow = false
       this.$emit('onSuccess')
+    },
+    handleCommand(val){
+      console.log(val)
+      this.type = val
+      this.drawerShow = true
     }
   },
   created() {}
@@ -78,31 +92,5 @@ export default {
 </script>
 
 <style scoped>
-.el-pagination {
-  text-align: right;
-}
-.panel_Target {
-  border-top:1px solid #eeeeee;
-  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>

src/Form/QuotedPrice/edit.vue

@@ -1,237 +1,246 @@
 <template>
   <div>
-    <el-button size="mini"  :type="btnType?btnType:'text'"  @click="dialogFormVisible = true" >编 辑</el-button>
+    <el-button size="mini"  :type="btnType?btnType:'text'"  @click="onShow" >编 辑</el-button>
     <el-drawer
         title="创建报价单"
-        :visible.sync="dialogFormVisible"
+        :visible.sync="drawer"
         size="50%"
         direction="rtl"
         append-to-body
         @close="onClose">
-      <div class="drawer__panel">
-        <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
-            <el-col :span="12">
-              <el-form-item label="项目名称:" >
-                <el-input v-model="form.projectname" placeholder="请选择项目" style="width: 100%" @focus="projectList"></el-input>
+      <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="11">
+              <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="12">
-              <el-form-item label="项目编号:" >
-                <el-input v-model="form.projectnum" placeholder="项目编号" style="width: 100%" disabled></el-input>
+            <el-col :offset="2" :span="11">
+              <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="12">
-              <el-form-item label="收件单位:" prop="enterprisename">
-                <el-input v-model="form.enterprisename" placeholder="请选择收件单位" style="width: 100%" @focus="enterpriseList"></el-input>
+            <el-col :span="11" v-if="isQuotedPrice">
+              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+                <el-input  v-model="form.projectname" autocomplete="off" placeholder="请选择项目" @focus="project" @projectList="projectList"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="收件人:" prop="name">
-                <el-input v-model="form.name" placeholder="请选择收件人" style="width: 100%" @focus="contactsList"></el-input>
+            <el-col :offset="2" :span="11" 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="12">
-              <el-form-item label="收件手机号:" >
-                <el-input v-model="form.phonenumber" placeholder="联系方式" style="width: 100%" disabled></el-input>
+            <el-col :span="11">
+              <el-form-item label="客户:" label-width="90px" prop="enterprisename">
+                <el-input  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @focus="customer" @customerList="customerList"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="报价单有效期:" >
+            <el-col :offset="2" :span="11">
+              <el-form-item label="报价日期:" label-width="90px">
                 <el-date-picker
-                  style="width: 100%"
-                  v-model="form.invaliddate"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                    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="24">
-              <p>商品明细报价</p>
-            </el-col>
-            <el-col :span="24">
-              <el-divider></el-divider>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="整单折扣(系数)" >
-                <el-input v-model="form.discountrate" placeholder="保留两位小数" style="width: 50%"></el-input>
-                <div>
-                  <div style="float: left;color:red">
-                    <span>*</span>
-                  </div>
-                  <span style="font-size: 10px;float: left"> 若无商品明细折扣信息，则以整单折扣计算；若有商品明细折扣信息，则以商品明细折扣计算</span>
-
-                </div>
-
+            <el-col :span="11">
+              <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="12" >
-              <el-button size="small" @click="dialogProjectVisible = false" type="info" class="inline-16" style="float: right">删除</el-button>
-              <el-button size="small" @click="dialogProjectVisible = false" type="primary" class="el-icon-plus inline-16" style="float: right">添加</el-button>
+            <el-col :offset="2" :span="11">
+              <el-form-item label="联系人:" label-width="90px" prop="name">
+                <el-input  v-model="form.contactsname" autocomplete="off" placeholder="联系人" @focus="contacts" @contactsList="contactsList"></el-input>
+              </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <product></product>
+            <el-col :span="11">
+              <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-form>
         </el-row>
       </div>
+      <div >
+        <el-divider></el-divider>
+      </div>
+      <div style="margin:30px 20px 20px 20px">
+        <quoted_price_product :id="form.sa_projectid" ref="quoterPrice" @checkForm="onSubmit"></quoted_price_product>
+      </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-    <project :visible="visibleProject" :index="index" v-if="visibleProject" @onProject="onProject"></project>
-    <enterprise :visible="visibleEnterprise" :index="index" :sa_projectid="form.sa_projectid" v-if="visibleEnterprise" @onEnterprise="onEnterprise"></enterprise>
-    <contacts :visible="visibleContacts" :index="index" :sys_enterpriseid="form.sys_enterpriseid" v-if="visibleContacts" @onContacts="onContacts"></contacts>
+    <project_table v-if="projectDrawer" :projectDrawer="projectDrawer" @projectData="projectData" @projectList="projectList"></project_table>
+    <customer_table v-if="customerDrawer" :customerDrawer="customerDrawer" :id="form.sa_projectid" :isQuotedPrice="isQuotedPrice" @customerData="customerData"  @customerList="customerList"></customer_table>
+    <contacts_table v-if="contactsDrawer" :contactsDrawer="contactsDrawer" :id="form.sys_enterpriseid" @contactsData="contactsData" @contactsList="contactsList"></contacts_table>
   </div>
 </template>
 
 <script>
-import layoutTable from "@/components/table/index3";
-import project from "@/SDrpManagement/QuotedPrice/detail/components/project";
-import enterprise from "@/SDrpManagement/QuotedPrice/detail/components/enterprise";
-import contacts from "@/SDrpManagement/QuotedPrice/detail/components/contacts";
-import product from "@/SDrpManagement/QuotedPrice/detail/components/product";
+import project_table from "@/SDrpManagement/QuotedPrice/components/projectTable";
+import customer_table from "@/SDrpManagement/QuotedPrice/components/customerTable";
+import contacts_table from "@/SDrpManagement/QuotedPrice/components/contactsTable";
+import quoted_price_product from "@/SDrpManagement/QuotedPrice/components/quotedPriceProduct";
 
 export default {
   name: "edit",
   props:['data','btnType'],
   data(){
     return {
-      visibleProject:false,
-      visibleEnterprise:false,
-      visibleContacts:false,
-      dialogFormVisible:false,
-      dialogProjectVisible:false,
-      tableHieght:320,
-      tablecols:[],
-      list:[],
-      total:0,
-      currentPage:0,
-      index:'',
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() + 3600 * 1000 * 24 < Date.now() ;
+        },
+      },
+      drawer:false,
+      projectDrawer:false,
+      customerDrawer:false,
+      contactsDrawer:false,
+      isQuotedPrice:false,
+      date:[],
       form:{
+        type:'',
+        projectnum:'',
+        enterprisename:'',
+        name:'',
+        phonenumber:'',
+        specialOffer:'否',
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
-        enterprisename:"",
+        contactsid:8,
         sa_projectid: "0",
-        contactsid:"",
-        name:"",
-        phonenumber:"",
-        discountrate:"" ,
+        discountrate: 0,
         remarks: "",
         invaliddate: "",
         projectname: "",
         address: "",
-        projectnum:""
+        billdate:"",
+        enddate:'',
+        begdate:''
       },
       rules:{
-        enterprisename: [
-          { required: true, message: '单位不能为空', trigger: 'change' },
+        projectname:[
+          { required: true, message: '请选择项目', trigger: 'change'},
         ],
-        name: [
-          { required: false, message: '联系人不能为空', trigger: 'change' },
+        enterprisename:[
+          { required: true, message: '请选择客户', trigger: 'change'},
         ],
+        name:[
+          { required: true, message: '请选择联系人', trigger: 'change'},
+        ]
       },
-      projectData:[],
-      params:{
-        "id": 20221020143502,
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 10,
-          "type":0, //  1：我负责的；2：我参与的；3：我下属负责的；4：我下属参与的
-          "where": {
-            "condition": ""
-          }
-        }
-      }
     }
   },
-  components:{
-    layoutTable,project,enterprise,contacts,product
-  },
+  components:{project_table,customer_table,contacts_table,quoted_price_product},
   methods:{
+    onShow(){
+      this.drawer = true
+      console.log(this.data,"报价单")
+      this.form = this.data
+      if (this.form.typeData === '项目报价'){
+        this.isQuotedPrice = true
+      }else {
+        this.isQuotedPrice = false
+      }
+      this.$nextTick(()=>{
+        this.$refs.quoterPrice.productData(this.data.sa_quotedpriceid)
+      })
+
+    },
+    onClose(){
+      this.drawer = false
+      this.$emit('addSuccess')
+    },
     onSubmit(){
-      console.log(this.form)
-      this.$refs['form'].validate(async (valid) => {
+      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
-        })
-        this.tool.showMessage(res,()=> {
-          console.log(res)
-          this.$refs['form'].resetFields();
-          this.$emit("onSuccess")
-          this.dialogFormVisible = false
+          "content": this.form
         })
+        console.log(res,"报价单id一")
+        /*this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type)*/
       })
     },
-    projectList(){
-      this.visibleProject = true
+    getSubmit(){
+      this.drawer = false
+      this.$emit('addSuccess')
     },
-    /*收件单位*/
-    enterpriseList(){
-      console.log(this.form.projectname)
-      this.visibleEnterprise = true
+    project(){
+      this.projectDrawer = true
     },
-    /*联系人*/
-    contactsList(){
-      console.log(this.form.sys_enterpriseid)
-      this.visibleContacts = true
+    customer(){
+      this.customerDrawer = true
     },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
-      this.projectList()
+    contacts(){
+      this.contactsDrawer = true
     },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
-      this.projectList()
+    customerList(){
+      this.customerDrawer = false
     },
-    onProject(data){
-      this.visible = false
-      console.log("获取")
-      console.log(data)
-      /*this.form = data*/
-      this.form.sa_projectid = data.sa_projectid
-      this.form.projectname = data.projectname
-      this.form.projectnum = data.projectnum
-      this.form.address = data.address
-      this.index = data.index
+    projectList(){
+      this.projectDrawer = false
     },
-    onEnterprise(data){
-      this.visible = false
-      console.log("企业信息")
-      console.log(data)
-      this.form.sys_enterpriseid = data.sys_enterpriseid
-      this.form.enterprisename = data.enterprisename
-
+    contactsList(){
+      this.contactsDrawer = false
     },
-    onContacts(data){
-      this.visible = false
-      console.log("联系人信息")
-      console.log(data)
-      this.form.contactsid = data.contactsid
-      this.form.name = data.name
-      this.form.phonenumber = data.phonenumber
+    /*项目选择信息*/
+    projectData(val){
+      this.projectDrawer = false
+      this.form.sa_projectid = val.sa_projectid
+      this.form.projectname = val.projectname
+      this.form.projectnum = val.projectnum
     },
-    checkboxCallBack(data) {
-      console.log("选择12354")
-      console.log(data)
-      this.projectData = data
+    /*客户选择信息*/
+    customerData(val){
+      this.contactsDrawer = false
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
     },
-    onClose(){
-      this.dialogFormVisible = false
-      this.$refs['form'].resetFields()
-    }
+    /*联系人选择信息*/
+    contactsData(val){
+      this.contactsDrawer = false
+      this.form.contactsid = val.contactsid
+      this.form.name = val.name
+      this.form.phonenumber = val.phonenumber
+    },
+  },
+  mounted() {
+    console.log(this.data,"报价单")
+
+   /* const date = new Date()
+    console.log(date)
+    this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+    console.log(this.form)*/
   },
   created() {
-    this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols
+    console.log(this.data,"获取项目报价")
   }
 }
 </script>

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -25,6 +25,11 @@
                 <el-input v-model="form.spec" placeholder="输入产品规格"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="牌价" prop="spec">
+                <el-input v-model="form.marketprice" placeholder="输入牌价"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="辅助单位">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isauxunit" @change="isauxunitChange">是否需要辅助单位</el-checkbox>

src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -111,7 +111,7 @@
             label="数量"
             width="180">
           <template slot-scope="scope">
-            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字"></el-input-number>
+            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -124,10 +124,10 @@
         </el-table-column>
         <el-table-column
             prop="discountrate"
-            label="折扣"
+            label="折扣(%)"
             width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price / scope.row.marketprice" size="mini" placeholder="请输入内容"></el-input>
+            <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -135,7 +135,7 @@
           label="单价"
           width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.marketprice * scope.row.discountrate / 100" size="mini" placeholder="请输入内容"></el-input>
+            <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -143,7 +143,7 @@
           label="金额"
           width="100">
           <template slot-scope="scope">
-            <p><span>{{scope.row.qty * scope.row.price}}</span></p>
+            <p><span>{{scope.row.amount}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -194,6 +194,7 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      changeList:[],
       param:{
         "id": 20221021095503,
         "version":1,
@@ -232,7 +233,6 @@ export default {
       this.productData()
     },
     clearData(){
-      console.log("执行")
       this.search = ""
       this.param.content.where.condition = this.search
       this.productData()
@@ -246,8 +246,56 @@ export default {
       this.$emit('checkForm')
     },
     quoterPrice(id,type){
-      console.log(id,"报价单id二")
       this.$refs.quoterPrice.queryProduct(id,type)
+    },
+    onChangeNum (val,data,index) {
+      console.log(val,data,index)
+      data.amount = data.qty * data.price
+      this.$set(this.list,index,data)
+      this.$nextTick(()=>{
+        this.objSet(this.list)
+      })
+    },
+    onChangeDiscountrate(val,data,index) {
+      data.price = data.marketprice * (data.discountrate / 100)
+      data.amount = data.qty * data.price
+      this.$set(this.list,index,data)
+      this.$nextTick(()=>{
+        this.objSet(this.list)
+      })
+    },
+    onChangePrice(val,data,index){
+      data.discountrate = ((data.price / data.marketprice) * 100).toFixed(2)
+      data.amount = data.qty * data.price
+      this.$set(this.list,index,data)
+      this.$nextTick(()=>{
+        this.objSet(this.list)
+      })
+    },
+    objSet(data){
+      let obj = data.map(e=>{
+        return {
+          sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
+          itemid:e.itemid,
+          oldprice:0,
+          price:e.price,
+          discountrate:e.discountrate,
+          qty:e.qty
+        }
+      })
+      this.changeData(obj)
+    },
+    async changeData(obj){
+      console.log(this.list,"数据")
+      const res = await this.$api.requested({
+        "id": 20221021095403,
+        "version":1,
+        "content": {
+          "sa_quotedpriceid":this.list[0].sa_quotedpriceid,     //sat_notice_classid<=0时 为新增
+          "items":obj
+        }
+      })
+      console.log(res)
     }
   }
 }

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -8,8 +8,9 @@
         :mainAreaData="mainAreaData"
         turnPageId="20221020165103"
         idname="sa_quotedpriceid"
+        ownertable="sa_quotedprice"
         :tags="[]"
-        :tabs="['详细信息','项目商机','产品设置','联系人','地址管理']"
+        :tabs="['详细信息','项目商机','关联客户','联系人']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -24,6 +25,9 @@
       <div slot="slot0" class="container normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>
       </div>
+      <div slot="slot1" class="container normal-panel">
+        <project_change :data="mainData" v-if="flag"></project_change>
+      </div>
       <div slot="slot3" class="container normal-panel">
         <contacts  :data="mainData"  v-if="flag"></contacts>
       </div>
@@ -40,6 +44,7 @@ import contacts from './modules/contacts/list'
 import address_manage from './modules/addressManage/list'
 import submit_to from './components/submitTo'
 import examine_to from './components/examineTo'
+import project_change from './modules/projectChange/index'
 export default {
   name: "index",
   data(){
@@ -50,7 +55,7 @@ export default {
     }
   },
   components:{
-    detailed,contacts,address_manage,submit_to,examine_to
+    detailed,contacts,address_manage,submit_to,examine_to,project_change
   },
   methods:{
     async queryMainData(id){
@@ -90,10 +95,6 @@ export default {
           label:'报价日期',
           value:this.mainData.createdate
         },
-        {
-          label:'整单折扣',
-          value:this.mainData.discountrate
-        },
         {
           label:'有效期',
           value:this.mainData.invaliddate

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -7,7 +7,6 @@
         <el-descriptions-item label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
         <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item>
         <el-descriptions-item label="项目地址">{{ basic.address?basic.address:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="整单折扣">{{ basic.discountrate?basic.discountrate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.invaliddate?basic.invaliddate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="负责人">{{ basic.contactsname?basic.contactsname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>

src/SDrpManagement/QuotedPrice/detail/modules/projectChange/index.vue

@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <tableLayout ref="list" :layout="tablecols" :data="list" :custom="true" height="300">
+      <template v-slot:customcol="scope">
+        <p >{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+    </tableLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  props:["data"],
+  data() {
+    return {
+      tablecols:'',
+      list:[],
+    }
+  },
+  mounted() {
+    console.log(this.data,"项目商机")
+   if (this.data.quotedpricetype === '项目报价') {
+     this.list[0] = this.data
+     console.log(this.list)
+   }else {
+     this.list = []
+   }
+
+
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -82,7 +82,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="getSubmit" class="normal-btn-width">确 定</el-button>
+        <el-button :disabled="form.sa_quotedpriceid === 0" size="small" type="primary" @click="getSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
     <project_table v-if="projectDrawer" :projectDrawer="projectDrawer" @projectData="projectData" @projectList="projectList"></project_table>
@@ -153,13 +153,17 @@ export default {
     },
     onSubmit(){
       console.log(this.data)
+      /*this.form.begdate = ''
+      this.form.enddate = ''
       if (this.date === '' && this.date === 'undefined'){
         this.form.begdate = ''
         this.form.enddate = ''
       }else {
         this.form.begdate = this.date[0]
         this.form.enddate = this.date[1]
-      }
+      }*/
+      this.data?this.form.begdate=this.date[0]:''
+      this.data?this.form.enddate=this.date[1]:''
       console.log(this.form,"表单")
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
@@ -170,11 +174,32 @@ export default {
         })
         console.log(res.data,"报价单id一")
         this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type)
+        this.form.sa_quotedpriceid = res.data.sa_quotedpriceid
       })
     },
     getSubmit(){
       this.drawer = false
-      this.$emit('addSuccess')
+      console.log(this.data)
+      if (this.date === '' && this.date === 'undefined'){
+        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.$emit('addSuccess')
+        })
+      })
+
     },
     project(){
       this.projectDrawer = true