暂存

src/Form/QuotedPrice/edit.vue

@@ -228,7 +228,7 @@
                         :total="contacts.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" disabled :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference"  :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -359,17 +359,15 @@ export default {
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
         ],
-        name:[
+       /* name:[
           { required: true, message: '请选择联系人', trigger: 'change'},
-        ]
+        ]*/
       },
     }
   },
   methods:{
     onShow(){
       this.drawer = true
-      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
@@ -378,17 +376,12 @@ export default {
       }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]
@@ -396,7 +389,6 @@ export default {
        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({
@@ -404,12 +396,9 @@ export default {
           "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 = ''
@@ -417,7 +406,6 @@ export default {
         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({
@@ -434,7 +422,6 @@ export default {
     },
     /*修改后的产品数据*/
     productDataChange(val){
-      console.log(val,"修改后的产品数据")
       let obj = val.map(e=>{
         return {
           sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
@@ -448,7 +435,6 @@ export default {
       this.productObj = obj
     },
     async changeData(obj){
-      console.log(this.productObj,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {
@@ -456,28 +442,25 @@ export default {
           "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
@@ -495,6 +478,7 @@ export default {
       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)
@@ -514,7 +498,7 @@ export default {
       this.form.projectnum = val.projectnum
       this.form.sys_enterpriseid = ''
       this.form.enterprisename = ''
-      this.form.contactsid = ''
+      this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
     },
@@ -522,7 +506,7 @@ export default {
     customerData(val){
       this.form.sys_enterpriseid = val.sys_enterpriseid
       this.form.enterprisename = val.enterprisename
-      this.form.contactsid = ''
+      this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
     },
@@ -567,19 +551,20 @@ export default {
     },
   },
   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() {
-    console.log(this.data,"获取项目报价")
   }
 }
 </script>
 
 <style scoped>
-
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
 </style>

src/Form/QuotedPrice/editCopy.vue

@@ -352,18 +352,16 @@ export default {
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
         ],
-        contactsname:[
+        /*contactsname:[
           { required: true, message: '请选择联系人', trigger: 'change'},
-        ]
+        ]*/
       },
     }
   },
   methods:{
     onShow(){
-      console.log('弹窗')
       this.drawer = true
       this.data = this.$route.query.data
-      /*this.form = this.data*/
       this.form = Object.assign({},this.form,this.$route.query.data)
       this.date[0] = this.form.begdate
       this.date[1] = this.form.enddate
@@ -372,18 +370,12 @@ export default {
       }else {
         this.isQuotedPrice = false
       }
-      console.log(this.form,"传过来的表单数据")
-      /*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]
@@ -391,20 +383,16 @@ export default {
        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)*/
+    this.$refs.form.validate(async (valid) => {
+      if (!valid) return false
+      const res = await this.$api.requested({
+        "id": 20221020164803,
+        "version":1,
+        "content": this.form
       })
+    })
     },
     getSubmit(){
-      console.log(this.data)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -412,7 +400,6 @@ export default {
         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({
@@ -429,7 +416,6 @@ export default {
     },
     /*修改后的产品数据*/
     productDataChange(val){
-      console.log(val,"修改后的产品数据")
       let obj = val.map(e=>{
         return {
           sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
@@ -443,7 +429,6 @@ export default {
       this.productObj = obj
     },
     async changeData(obj){
-      console.log(this.productObj,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {
@@ -451,25 +436,20 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.$emit('onSuccess')
       this.$store.dispatch('changeDetailDrawer',false)
     },
     /*刷新总金额*/
     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()
@@ -568,13 +548,19 @@ export default {
   created() {
     this.onShow()
     this.data = this.$route.query.data
-    /*this.drawer = true*/
-    console.log(this.data,"获取项目报价")
-    console.log(this.$route.query.data,"获取项目报价1111")
   }
 }
 </script>
 
 <style scoped>
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
 
 </style>

src/Form/projectStageMag/add.vue

@@ -18,7 +18,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="顺序"  >
+              <el-form-item label="顺序" prop="sequence" >
                 <el-input  v-model="form.sequence" autocomplete="off" placeholder="输入阶段顺序"></el-input>
               </el-form-item>
             </el-col>

src/Form/projectStageMag/edit.vue

@@ -18,7 +18,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="顺序"  >
+              <el-form-item label="顺序"  prop="sequence">
                 <el-input  v-model="form.sequence" autocomplete="off" placeholder="输入阶段顺序"></el-input>
               </el-form-item>
             </el-col>
@@ -76,6 +76,9 @@ export default {
         remarks: [
           { required: true, message: '说明不能为空', trigger: 'blur' },
         ],
+        sequence: [
+          { required: true, message: '请输入顺序', trigger: 'change' },
+        ],
       },
       param:{
         "classname": "sysmanage.develop.optiontype.optiontype",

src/Form/publicCustomer/add.vue

@@ -79,13 +79,70 @@
                 <el-select v-model="form.customergrade" placeholder="请选择客户等级" size="small">
                   <el-option
                     v-for="item in customerLead()"
-                    :key="item.rowindex"
+                    :key="item.value"
                     :label="item.value"
-                    :value="item.rowindex">
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="上级客户:" >
+                <el-popover
+                    placement="bottom"
+                    width="700"
+                    trigger="click"
+                    v-model="customerShow"
+                    @show="customerList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
+                  <el-table :data="customer.customerData" @row-click="customerData" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                    <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="地址"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </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"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference" :readonly="true" v-model="form.superiorenterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="详细地址"></el-input>
@@ -102,11 +159,18 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="所属行业:" prop="industry">
-                <el-input v-model="form.industry" placeholder="所属行业"></el-input>
+              <el-form-item label="所属行业:" >
+                <el-select v-model="form.industry" placeholder="请选择所属行业" style="width: 100%">
+                  <el-option
+                      v-for="item in options.industryData"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+<!--            <el-col :span="24">
               <el-form-item label="联系人:" prop="contact">
                 <el-input v-model="form.contact" placeholder="联系人"></el-input>
               </el-form-item>
@@ -115,7 +179,7 @@
               <el-form-item label="联系电话:" prop="phonenumber">
                 <el-input v-model="form.phonenumber" placeholder="联系电话"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="24">
               <el-form-item label="省市县:" >
                 <el-cascader
@@ -161,6 +225,7 @@ export default {
       dialogFormVisible:false,
       isordercheck:true,
       isusedcheck:false,
+      customerShow:false,
       checkResults:'',
       businessData:[],
       businessParam:{
@@ -174,6 +239,9 @@ export default {
       businessShow:false,
       total:0,
       currentPage:0,
+      options:{
+        industryData:[]
+      },
       form:{
         "sa_customersid": 0,//新增是传0
         "parentid": 0, //上级客户ID,默认或没有上级的时候传0
@@ -198,7 +266,7 @@ export default {
       value:'',
       rules:{
         enterprisename:[
-          { required: true, message: '输入客户名称', trigger: 'blur'},
+          { required: true, message: '输入客户名称', trigger: 'change,blur'},
         ],
         type: [
           { required: true, message: '还未选择客户类型', trigger: 'change' },
@@ -209,7 +277,24 @@ export default {
         sa_customerpoolid:[
           { required: true, message: '请选择公海池', trigger: 'blur'}
         ]
-      }
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "where": {
+            "condition": "",
+            "type":2,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
     }
   },
   methods:{
@@ -332,6 +417,7 @@ export default {
             }
             this.dialogFormVisible = false
             this.checkResults = ''
+            this.value = ''
           }else {
             this.setTag(res.data.sa_customersid)
           }
@@ -375,6 +461,7 @@ export default {
       }
       this.dialogFormVisible = false
       this.checkResults = ''
+      this.value = ''
     },
     onClose(){
       this.$refs['form'].resetFields();
@@ -399,6 +486,7 @@ export default {
       }
       this.dialogFormVisible = false
       this.checkResults = ''
+      this.value = ''
     },
     cascaderChange (val) {
       if (val.length === 1)
@@ -407,6 +495,52 @@ export default {
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
 
     },
+    async customerList(){
+      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()
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.parentid = val.sa_customersid
+      this.form.superiorenterprisename = val.enterprisename
+      this.customerShow = false
+    },
+    /*客户分页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.customerList()
+    },
+    /*行业列表*/
+    async industryList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "industry",
+          "parameter": {
+            "siteid": "YOSTEST2"
+          }
+        }
+      })
+      this.options.industryData = res.data
+    }
+  },
+  mounted() {
+    this.industryList()
   }
 }
 </script>

src/Form/publicCustomer/edit.vue

@@ -72,7 +72,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户等级:" prop="grade">
-                <el-select v-model="form.grade" placeholder="请选择客户等级" size="small">
+                <el-select v-model="form.customergrade" placeholder="请选择客户等级" size="small">
                   <el-option
                     v-for="item in customerLead()"
                     :key="item.rowindex"

src/Form/salerPrivatecustomer/add.vue

@@ -50,17 +50,6 @@
                     </template>
                   </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="[5]"
-                      layout="total,sizes, prev, pager, next, jumper"
-                      :total="total">
-                  </el-pagination>
-                </div>-->
                 <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
               </el-popover>
             </el-col>
@@ -91,8 +80,6 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
-<!--                    <span style="float: left">{{ item.value }}</span>
-                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>-->
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -111,7 +98,59 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="上级客户:" >
-                <el-input v-model="form.superiorenterprisename"  placeholder="请选择上级客户" @focus="enterpriseList"></el-input>
+                <el-popover
+                    placement="bottom"
+                    width="700"
+                    trigger="click"
+                    v-model="customerShow"
+                    @show="customerList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
+                  <el-table :data="customer.customerData" @row-click="customerData" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                    <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="地址"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </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"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference" :readonly="true" v-model="form.superiorenterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -187,6 +226,7 @@ export default {
     return {
       dialogFormVisible:false,
       visibleEnterprise:false,
+      customerShow:false,
       checkResults:'',
       index:'',
       businessData:[],
@@ -234,7 +274,24 @@ export default {
         type: [
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
-      }
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "where": {
+            "condition": "",
+            "type":2,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
     }
   },
   computed:{
@@ -343,27 +400,10 @@ export default {
           if (this.checkResults === 0){
             this.$emit('onSuccess')
             this.$refs['form'].resetFields();
-            this.form = {
-              sa_customersid:0,
-              sys_enterpriseid:0,
-              enterprisename:'',
-              type:'',
-              source:'',
-              parentid:0,
-              superiorenterprisename:'',
-              abbreviation:'',
-              taxno:'',
-              customergrade:'',
-              industry:'',
-              phonenumber:'',
-              province:'',
-              city:'',
-              county:'',
-              address:'',
-
-            }
+            this.form = {}
             this.dialogFormVisible = false
             this.checkResults = ''
+            this.value = ''
           }else {
             this.setTag(res.data.sa_customersid)
           }
@@ -383,51 +423,18 @@ export default {
       })
       this.$emit('onSuccess')
       this.$refs['form'].resetFields();
-      this.form = {
-        sa_customersid:0,
-        sys_enterpriseid:0,
-        enterprisename:'',
-        type:'',
-        source:'',
-        parentid:0,
-        superiorenterprisename:'',
-        abbreviation:'',
-        taxno:'',
-        customergrade:'',
-        industry:'',
-        phonenumber:'',
-        province:'',
-        city:'',
-        county:'',
-        address:'',
-
-      }
+      this.form = {}
       this.dialogFormVisible = false
       this.checkResults = ''
+      this.value = ''
     },
     onClose () {
       this.$refs['form'].resetFields();
-      this.form = {
-        sa_customersid:0,
-        sys_enterpriseid:0,
-        enterprisename:'',
-        type:'',
-        source:'',
-        parentid:0,
-        superiorenterprisename:'',
-        abbreviation:'',
-        taxno:'',
-        customergrade:'',
-        industry:'',
-        phonenumber:'',
-        province:'',
-        city:'',
-        county:'',
-        address:'',
-
-      }
+      this.form = {}
       this.dialogFormVisible = false
       this.checkResults = ''
+      this.value = ''
+
     },
     /*客户类型列表*/
     async typeList(){
@@ -445,7 +452,33 @@ export default {
       })
       this.options.type = res.data
     },
-
+    async customerList(){
+      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()
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.parentid = val.sa_customersid
+      this.form.superiorenterprisename = val.enterprisename
+      this.customerShow = false
+    },
+    /*客户分页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.customerList()
+    },
     enterpriseList(){
 
       this.visibleEnterprise = true

src/HDrpManagement/projectChange/components/putPeople.vue

@@ -1,28 +1,13 @@
 <template>
   <div>
     <div v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" class="inline-16">
-      <el-popconfirm
-          title="确定进行提交报备操作吗？"
-          @confirm="onSubmit"
-      >
-        <el-button  size="mini" type="primary" slot="reference">提交报备</el-button>
-      </el-popconfirm>
+      <el-button  size="mini" type="primary" slot="reference" @click="onSubmit">提交报备</el-button>
     </div>
     <div v-else-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" class="inline-16">
-      <el-popconfirm
-          title="确定进行报备审核操作吗？"
-          @confirm="onCheck"
-      >
-        <el-button size="mini" type="primary" slot="reference">报备审核</el-button>
-      </el-popconfirm>
+      <el-button size="mini" type="primary" slot="reference" @click="onCheck">报备审核</el-button>
     </div>
     <div v-if="flag !== 0 && tool.checkAuth($route.name,'putBack') " class="inline-16">
-      <el-popconfirm
-          title="确定进行取消审核操作吗？"
-          @confirm="onUnCheck"
-      >
-        <el-button size="mini" type="primary" slot="reference">报备驳回(退回)</el-button>
-      </el-popconfirm>
+      <el-button size="mini" type="primary" slot="reference" @click="onUnCheck">报备驳回(退回)</el-button>
     </div>
 
   </div>
@@ -47,44 +32,77 @@ export default {
       console.log(this.rowData)
       /*this.tagData()*/
     },
-    async onSubmit(){
-      const res = await this.$api.requested({
-        "id": 20221114163402,
-        "content": {
-          "sa_projectid": this.rowData.sa_projectid,
-          "type": 1 //报备中，已报备
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.flag = 1
-        this.$emit('putSuccess',this.flag)
-      })
+    onSubmit(){
+      this.$confirm('确定进行提交报备操作吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        const res = await this.$api.requested({
+          "id": 20221114163402,
+          "content": {
+            "sa_projectid": this.rowData.sa_projectid,
+            "type": 1 //报备中，已报备
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.flag = 1
+          this.$emit('putSuccess',this.flag)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消提交报备'
+        });
+      });
     },
-    async onCheck(){
-      const res = await this.$api.requested({
-        "id": 20221114163402,
-        "content": {
-          "sa_projectid": this.rowData.sa_projectid,
-          "type": 2 //报备中，已报备
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.flag = 2
-        this.$emit('putSuccess',this.flag)
-      })
+    onCheck(){
+      this.$confirm('确定进行报备审核操作吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        const res = await this.$api.requested({
+          "id": 20221114163402,
+          "content": {
+            "sa_projectid": this.rowData.sa_projectid,
+            "type": 2 //报备中，已报备
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.flag = 2
+          this.$emit('putSuccess',this.flag)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消报备审核'
+        });
+      });
     },
-    async onUnCheck(){
-      const res = await this.$api.requested({
-        "id": 20221114163402,
-        "content": {
-          "sa_projectid": this.rowData.sa_projectid,
-          "type": 3 //报备中，已报备
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.flag = 0
-        this.$emit('putSuccess',this.flag)
-      })
+    onUnCheck(){
+      this.$confirm('确定进行报备驳回(退回)操作吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        const res = await this.$api.requested({
+          "id": 20221114163402,
+          "content": {
+            "sa_projectid": this.rowData.sa_projectid,
+            "type": 3 //报备中，已报备
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.flag = 0
+          this.$emit('putSuccess',this.flag)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消报备驳回(退回)'
+        });
+      });
     },
     async tagData(){
       console.log(this.rowData.sa_projectid,"rowData数据")

src/HDrpManagement/projectChange/index.vue

@@ -98,6 +98,9 @@
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'name'">
+          {{scope.data.column.data.leader[0].name}}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -137,7 +137,6 @@ export default {
       })
 
       this.mainData = res.data
-      console.log(this.mainData,"重新刷新数据");
       /* 获取标签数据 */
       /*this.tagObj = await this.$store.dispatch('queryTagList',{table:'sa_project',id:this.mainData.sa_projectid})*/
       this.flag = 1
@@ -154,7 +153,6 @@ export default {
     },
     // 获取标签数据
     async tagData(){
-      console.log(this.$refs.details.tags,'标签')
       const res = await this.$api.requested({
         content: {
           ownertable: "sa_project",
@@ -162,9 +160,7 @@ export default {
         },
         id: 20220929085401
       })
-      console.log(res,'标签')
       if (res.data.systemtag.length === 0){
-        console.log("还未有报备")
         this.flagTag = 0
       }else {
         for (let i=0;i<res.data.systemtag.length;i++){
@@ -180,7 +176,6 @@ export default {
         }
       }
       this.$refs.details.$refs.tag.queryTag()
-      console.log(this.flagTag,'报备标签状态')
       this.put.putFlag = this.flagTag
       this.mainData = Object.assign({},this.put,this.mainData)
     },
@@ -200,8 +195,6 @@ export default {
     },
     /*获取货品选择信息*/
     selectionChange(val){
-      console.log("返回")
-      console.log(val)
     },
     /* 获取联系人:负责人列表 */
     async getAccount () {
@@ -217,32 +210,6 @@ export default {
         }
       })
     },
-    /* 获取当前用户信息 */
-   /* async getUserInfo() {
-      let res = await this.$api.requested({
-        "classname": "common.usercenter.usercenter",
-        "method": "queryUserMsg",
-        "content": {
-        }
-      })
-      this.userInfo = res.data
-      console.log(this.userInfo);
-      
-    },*/
-    /* 可报备人 */
-    /*async getPutPeople () {
-      let res = await this.$api.requested({
-        "id": 20221021093202,
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 999999,
-          "where": {
-              "condition": ""
-          }
-        },
-      })
-      this.putPeople = res.data
-    },*/
     async getSysetms () {
       /* 获取项目类型 */
       let res = await this.$store.dispatch('optiontypeselect','projecttype')
@@ -276,7 +243,6 @@ export default {
         }
       })
       this.projectAddress = res.data
-      console.log(this.projectAddress);
       
       /* 获取项目等级 */
       let res2 = await this.$store.dispatch('optiontypeselect','projectgrade')
@@ -295,9 +261,9 @@ export default {
           {label: '项目等级',value: this.mainData.grade ? this.mainData.grade : '--'},
           {label:'项目类型',value:this.mainData.projecttype ? this.mainData.projecttype : '--'},
           {label:'当前项目阶段',value:this.mainData.stagename ? this.mainData.stagename : '--'},
-          {label:'项目报备时间',value:''},
-          {label:'项目联系人',value:this.mainData.contact ? this.mainData.contact : '--'},
-          {label:'联系人手机号',value:this.mainData.phonenumber ? this.mainData.phonenumber : '--'},
+          {label:'项目报备时间',value:this.mainData.reportdate?this.mainData.reportdate:'--'},
+        /*  {label:'项目联系人',value:this.mainData.contact ? this.mainData.contact : '--'},
+          {label:'联系人手机号',value:this.mainData.phonenumber ? this.mainData.phonenumber : '--'},*/
           {label:'项目规模',value:this.mainData.scale ? this.mainData.scale : '--'},
           {label:'项目状态',value:this.mainData.status ? this.mainData.status : '--'},
           {label:'项目折扣',value:this.mainData.discountrate ? this.mainData.discountrate : '--'},
@@ -385,7 +351,6 @@ export default {
           "sa_projectid":this.mainData.sa_projectid
         }
       })
-      console.log(res,"当前项目阶段")
       this.stageList = res.data
       res.data.forEach((e)=>{
         if (e.active === 1){
@@ -395,7 +360,6 @@ export default {
     },
     /*切换阶段*/
     changeSelect(val){
-      console.log(val)
       this.nowStage = val
       this.selectRowindex = val.rowindex
     },
@@ -412,14 +376,12 @@ export default {
           }
         },
       })
-      console.log(res,"产品配置清单")
       res.data.forEach(e=>{
         this.totalPrice = this.totalPrice + e.amount
       })
     },
     /*报备结果*/
     putSuccess(val){
-      console.log(val)
       this.put.putFlag = val
       this.queryMainData(this.$route.query.id)
 
@@ -442,9 +404,10 @@ export default {
 </script>
 <style scoped>
 .stage__panel{
+  padding: 0px 10px 0px 10px ;
   height: 32px;
   line-height: 32px;
-  width:85px;
+  min-width:85px;
   border-radius: 2px;
   transform: skewX(-20deg);
   margin-left:15px;

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -14,7 +14,59 @@
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="客户名称:" prop="enterprisename">
-                <el-input v-model="form.enterprisename" placeholder="请选择企业" @focus="enterpriseList"></el-input>
+                <el-popover
+                    placement="bottom"
+                    width="700"
+                    trigger="click"
+                    v-model="customerShow"
+                    @show="customerList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
+                  <el-table :data="customer.customerData" @row-click="customerData" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                    <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="地址"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </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"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -51,6 +103,7 @@ export default {
     return {
       visible:false,
       visibleEnterprise:false,
+      customerShow:false,
       customertype:'',
       index:'',
       form:{
@@ -64,7 +117,24 @@ export default {
         enterprisename:[
           { required: true, message: '请选择企业', trigger: 'change'},
         ],
-      }
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "where": {
+            "condition": "",
+            "type":2,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
     }
   },
   methods:{
@@ -109,6 +179,33 @@ export default {
       this.form.sys_enterpriseid = data.sys_enterpriseid
       this.form.enterprisename = data.enterprisename
     },
+    async customerList(){
+      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()
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.customerShow = false
+    },
+    /*客户分页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.customerList()
+    },
 
   },
   mounted() {
@@ -118,5 +215,13 @@ export default {
 </script>
 
 <style scoped>
-
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
 </style>

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -128,7 +128,7 @@
             label="数量"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.qty?scope.row.qty:'--'}}</span></p>
+            <p><span>{{scope.row.qty !== ''?scope.row.qty:'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -138,7 +138,7 @@
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" disabled :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                  <el-input slot="reference"  :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -228,7 +228,7 @@
                         :total="contacts.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" disabled :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference"  :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -370,7 +370,6 @@ export default {
     },
     /*创建报价单，获取商品信息*/
     onSubmit(){
-      console.log(this.date)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -378,7 +377,6 @@ export default {
         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({
@@ -392,7 +390,6 @@ export default {
     },
     /*导入创建报价单校验*/
     onCheckFormImport(){
-      console.log(this.date)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -400,7 +397,6 @@ export default {
         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({
@@ -415,7 +411,6 @@ export default {
     /*提交*/
     getSubmit(){
       this.dialogFormVisible = false
-      console.log(this.data)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -423,7 +418,6 @@ export default {
         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({
@@ -438,7 +432,6 @@ export default {
     },
     /*修改后的产品数据*/
     productDataChange(val){
-      console.log(val,"修改后的产品数据")
       let obj = val.map(e=>{
         return {
           sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
@@ -452,7 +445,6 @@ export default {
       this.productObj = obj
     },
     async changeData(obj){
-      console.log(this.productObj,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {
@@ -460,18 +452,15 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.$emit('addSuccess')
     },
     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.projectParam.content.where.condition = this.form.projectname
       this.projectList()
     },
@@ -509,7 +498,7 @@ export default {
       this.form.projectnum = val.projectnum
       this.form.sys_enterpriseid = ''
       this.form.enterprisename = ''
-      this.form.contactsid = ''
+      this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
       this.projectShow = false
@@ -518,7 +507,7 @@ export default {
     customerData(val){
       this.form.sys_enterpriseid = val.sys_enterpriseid
       this.form.enterprisename = val.enterprisename
-      this.form.contactsid = ''
+      this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
       this.customerShow = false
@@ -566,13 +555,11 @@ export default {
   },
   mounted() {
     const date = new Date()
-    console.log(date)
     this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
     this.form.sa_projectid = this.data.sa_projectid
     this.form.projectname = this.data.projectname
     this.form.projectnum = this.data.projectnum
     this.form.type = '项目报价'
-    console.log(this.form)
   }
 }
 </script>
@@ -585,4 +572,13 @@ export default {
 /deep/.el-input__inner {
   height: 28px !important;
 }
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
 </style>

src/HDrpManagement/projectChange/modules/modules/stageTask/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="onShow">编 辑</el-button>
+    <el-button type="text" size="mini" @click="onShow">评 估</el-button>
 <!-- 选择客户对象 -->
     <el-drawer
         title="选择客户对象"

src/HDrpManagement/publicCustomer/index.vue

@@ -173,7 +173,6 @@ export default {
       /* 获取客户等级 */
       let res2 = await this.$store.dispatch('optiontypeselect','customergrade')
       this.customerLead = res2.data
-      console.log(this.customerLead);
       
     },
     /* 获取公海数据 */
@@ -214,21 +213,12 @@ export default {
         },
       })
       this.option.poolList = res.data
-      console.log("公海池")
-      console.log(this.option.poolList)
     },
     handleCommand(command){
-      console.log(command)
       this.tabIndex = command.sa_customerpoolid
       this.poolValue = command.poolname
       this.$refs['basicLayout'].param.content.where.sa_customerpoolid = command.sa_customerpoolid
       this.$refs['basicLayout'].listData()
-      // this.tabIndex = command.name
-      // this.editableTabsValue = command.title
-      // this.$refs['list'].param.content.type = command.name
-      // this.$refs['list'].param.content.isExport = 0
-      // this.$refs['list'].listData()
-      // this.$store.dispatch('sendDataToForm',)
     },
     /*客户类型列表*/
     async typeList(){
@@ -245,8 +235,6 @@ export default {
         }
       })
       this.option.typeData = res.data
-      console.log("客户类型",res.data)
-      console.log(this.option.typeData)
 
     },
     /*客户等级*/
@@ -263,16 +251,7 @@ export default {
           }
         }
       })
-      console.log("客户等级",res.data)
-      /*for (var i=0;i<res.data.length; i++){
-        if (res.data[i].remarks !== ''){
-          this.options.gradeData[i] = res.data[i].value + "——" + res.data[i].remarks
-        }else{
-          this.options.gradeData[i] = res.data[i].value
-        }
-      }*/
       this.option.gradeData = res.data
-      console.log("处理后客户等级",this.option.gradeData)
     },
     /*行业列表*/
     async industryList(){

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -169,8 +169,8 @@ export default {
           value:this.mainData.sa_customersid
         },
         {
-          label:'客户级别',
-          value:this.mainData.grade
+          label:'客户等级',
+          value:this.mainData.customergrade
         },
         {
           label:'客户类型',

src/HDrpManagement/publicCustomer/modules/detail/detailedData.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item label="客户编号">{{ basic.sa_customersid?basic.sa_customersid:"--" }}</el-descriptions-item>
         <el-descriptions-item label="企业简称">{{ basic.abbreviation?basic.abbreviation:"--"}}</el-descriptions-item>
         <el-descriptions-item label="客户类型">{{ basic.type?basic.type:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="客户级别">{{ basic.grade?basic.grade:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="客户等级">{{ basic.customergrade?basic.customergrade:"--" }}</el-descriptions-item>
         <el-descriptions-item label="所属行业">{{ basic.industry?basic.industry:"--" }}</el-descriptions-item>
         <el-descriptions-item label="上级企业">{{ basic.superiorenterprisename?basic.superiorenterprisename:"--" }}</el-descriptions-item>
         <el-descriptions-item label="成交状态">{{ basic.tradingstatus?basic.tradingstatus:"--" }}</el-descriptions-item>

src/SDrpManagement/QuotedPrice/components/contactsTable.vue

@@ -65,7 +65,6 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(res)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -78,7 +77,6 @@ export default {
       this.contactsList()
     },
     selectProject(val){
-      console.log("选择")
       this.$emit('contactsData',val)
       this.dialogProjectVisible = false
 

src/SDrpManagement/QuotedPrice/components/customerTable.vue

@@ -68,14 +68,12 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
-        console.log(res)
       }else {
         this.param.content.where.type = 2
         const res = await this.$api.requested(this.param)
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
-        console.log(res)
       }
 
     },
@@ -90,7 +88,6 @@ export default {
       this.customerList()
     },
     selectProject(val){
-      console.log("选择")
       this.$emit('customerData',val)
       this.dialogProjectVisible = false
 

src/SDrpManagement/QuotedPrice/components/delProduct.vue

@@ -27,7 +27,6 @@ export default {
   },
   methods:{
     async delProduct(){
-      console.log(this.data)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "version":1,

src/SDrpManagement/QuotedPrice/components/edit/productTable.vue

@@ -166,10 +166,7 @@ export default {
   },
   methods:{
     onShow(){
-     /* this.dialogProjectVisible = true*/
-     /* console.log(this.id,"项目编号")
-      this.$emit('checkForm')*/
-      /*this.productData()*/
+
 
     },
     onColes(){
@@ -184,7 +181,6 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        console.log(res)
         this.dialogProductVisible = false
         this.$emit('productAdd')
       })
@@ -192,28 +188,15 @@ export default {
     /*获取产品信息*/
     queryProduct(){
       this.dialogProductVisible = true
-      console.log(this.id,this.sa_quotedpriceid,"接受传过来的数据")
       this.params.content.sa_projectid = 0
       this.productData()
     },
     /*产品配置信息*/
     async productData(){
-      console.log("执行")
       this.params.content.sa_quotedpriceid = this.sa_quotedpriceid
       const res = await this.$api.requested(this.params)
-      console.log(res,"产品配置")
       this.list = res.data
       this.total = res.total
-      console.log(res,'产品配置信息')
-      console.log(this.quotedpricetype)
-      /*this.$nextTick(()=>{
-        console.log(this.quotedpricetype)
-        if (this.quotedpricetype === '项目报价'){
-          for (let i=0;i<this.list.length;i++){
-            this.$refs.multipleTable.toggleRowSelection(this.list[i],true)
-          }
-        }
-      })*/
 
     },
     handleSizeChange(val) {
@@ -230,7 +213,6 @@ export default {
       this.productData()
     },
     clearData(){
-      console.log("执行")
       this.search = ""
       this.param.content.where.condition = this.search
       this.productData()
@@ -240,7 +222,6 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val)
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -254,7 +235,6 @@ export default {
             qty:e.qty
           }
         })
-        console.log(obj)
         this.selectData = obj
       }else {
         let obj = this.tableSelectData.map(e=>{
@@ -268,7 +248,6 @@ export default {
             qty:1
           }
         })
-        console.log(obj)
         this.selectData = obj
       }
     }

src/SDrpManagement/QuotedPrice/components/edit/productTableProject.vue

@@ -166,10 +166,7 @@ export default {
   },
   methods:{
     onShow(){
-     /* this.dialogProjectVisible = true*/
-     /* console.log(this.id,"项目编号")
-      this.$emit('checkForm')*/
-      /*this.productData()*/
+
 
     },
     onColes(){
@@ -184,7 +181,6 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        console.log(res)
         this.dialogProductVisible = false
         this.$emit('productAdd')
       })
@@ -192,22 +188,16 @@ export default {
     /*获取产品信息*/
     queryProduct(){
       this.dialogProductVisible = true
-      console.log(this.id,this.sa_quotedpriceid,"接受传过来的数据")
       this.params.content.sa_projectid = this.id
       this.productData()
     },
     /*产品配置信息*/
     async productData(){
-      console.log("执行")
       this.params.content.sa_quotedpriceid = this.sa_quotedpriceid
       const res = await this.$api.requested(this.params)
-      console.log(res,"产品配置")
       this.list = res.data
       this.total = res.total
-      console.log(res,'产品配置信息')
-      console.log(this.quotedpricetype)
       this.$nextTick(()=>{
-        console.log(this.quotedpricetype)
         if (this.quotedpricetype === '项目报价'){
           for (let i=0;i<this.list.length;i++){
             this.$refs.multipleTable.toggleRowSelection(this.list[i],true)
@@ -230,7 +220,6 @@ export default {
       this.productData()
     },
     clearData(){
-      console.log("执行")
       this.search = ""
       this.param.content.where.condition = this.search
       this.productData()
@@ -240,7 +229,6 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val)
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -254,7 +242,6 @@ export default {
             qty:e.qty
           }
         })
-        console.log(obj)
         this.selectData = obj
       }else {
         let obj = this.tableSelectData.map(e=>{
@@ -268,7 +255,6 @@ export default {
             qty:1
           }
         })
-        console.log(obj)
         this.selectData = obj
       }
     }

src/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct.vue

@@ -134,14 +134,6 @@
             <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
-            prop="mindiscountrate"
-            label="最低授权折扣(%)"
-            width="130">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.mindiscountrate}}</span></p>
-          </template>
-        </el-table-column>-->
         <el-table-column
           prop="price"
           label="单价"
@@ -150,14 +142,6 @@
             <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
-            prop="discountDifferenceAmount"
-            label="授权折扣差额"
-            width="130">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
-          </template>
-        </el-table-column>-->
         <el-table-column
           prop="amount"
           label="金额"
@@ -174,14 +158,6 @@
             <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
           </template>
         </el-table-column>
-<!--        <el-table-column
-            prop="operation"
-            label="操作"
-            width="100">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="deleteProduct(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>-->
       </el-table>
       <div style="height: 35px;margin-top: 20px">
         <div style="float: left">总金额：{{ totalPrice }}元</div>
@@ -243,9 +219,7 @@ export default {
   methods:{
     /*产品配置信息*/
     async productData(){
-      console.log(this.sa_quotedpriceid,this.sa_projectid,this.quotedpricetype,"配置信息")
       this.param.content.sa_quotedpriceid = this.sa_quotedpriceid
-      console.log(this.param,"param数据")
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
@@ -255,7 +229,6 @@ export default {
         this.list[i].mindiscountrate = this.list[i].mindiscountrate * 100
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
-      console.log(this.list,'产品配置信息')
       this.$emit('productData',this.list)
     },
     handleSizeChange(val) {
@@ -285,30 +258,21 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val,'选择')
       for (let i=0;i<val.length;i++){
         this.selectDel[i] = val[i].sa_quotedprice_itemsid
       }
-      console.log(this.selectDel)
     },
     checkForm(){
       this.$emit('checkForm')
     },
     quoterPrice(sa_quotedpriceid,type){
       this.sa_quotedpriceid = sa_quotedpriceid
-      console.log(sa_quotedpriceid,"报价单id")
-      console.log(type,"项目报价")
       this.$refs.quoterPrice.queryProduct(sa_quotedpriceid,type)
       this.$refs.quoterPriceProject.queryProduct(sa_quotedpriceid,type)
     },
     onChangeNum (val,data,index,step) {
-      console.log("步长",this.step)
-      console.log(val,data,index,step)
       data.amount = val * data.price
-      console.log(data.marketprice * data.mindiscountrate,"最低折扣")
-      console.log(data.marketprice * data.discountrate,"目前折扣")
       data.discountDifferenceAmount = (data.marketprice * (data.mindiscountrate/100) - data.marketprice * (data.discountrate/100))
-      console.log(data.discountDifferenceAmount,"差额")
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
@@ -318,7 +282,6 @@ export default {
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
-      console.log(val,data,index)
       if (val > 100){
         data.discountrate = 100
         val = 100
@@ -328,10 +291,7 @@ export default {
       }
       data.price = data.marketprice * (val / 100)
       data.amount = (data.qty * data.price).toFixed(2)
-      console.log(data.marketprice * data.mindiscountrate,"最低折扣")
-      console.log(data.marketprice * data.discountrate,"目前折扣")
       data.discountDifferenceAmount = (data.discountrate - data.mindiscountrate)/100 * data.marketprice
-      console.log(data.discountDifferenceAmount,"差额")
       if (data.discountDifferenceAmount < 0){
         data.specialoffer =1
       }
@@ -373,7 +333,6 @@ export default {
       this.changeDiscountrateData(obj)
     },
     async changeData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -382,11 +341,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productData(res.data[0].sa_quotedpriceid)
     },
     async changeDiscountrateData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -395,11 +352,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productDiscountrateData(res.data[0].sa_quotedpriceid)
     },
     async deleteProduct(val){
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "version":1,

src/SDrpManagement/QuotedPrice/components/productInventory.vue

@@ -222,7 +222,6 @@ export default {
         this.list[i].discountrate = this.list[i].discountrate * 100
 
       }
-      console.log(this.list,'产品配置信息')
     },
     /*产品配置信息*/
     async productData(id){
@@ -233,7 +232,6 @@ export default {
       for (var i=0 ;i<this.list.length;i++){
         this.list[i].discountrate = this.list[i].discountrate * 100
       }
-      console.log(this.list,'产品配置信息')
     },
     /*修改折扣或单价的时候刷新*/
     async productDiscountrateData(id){
@@ -244,7 +242,6 @@ export default {
       for (var i=0 ;i<this.list.length;i++){
         this.list[i].discountrate = this.list[i].discountrate * 100
       }
-      console.log(this.list,'产品配置信息')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -273,12 +270,9 @@ export default {
       this.$emit('checkForm')
     },
     quoterPrice(id,type){
-      console.log(id,"报价单id")
-      console.log(type,"项目报价")
       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(()=>{
@@ -335,7 +329,6 @@ export default {
       this.changeDiscountrateData(obj)
     },
     async changeData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -344,11 +337,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productData(res.data[0].sa_quotedpriceid)
     },
     async changeDiscountrateData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -357,11 +348,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productDiscountrateData(res.data[0].sa_quotedpriceid)
     },
     async deleteProduct(val){
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "version":1,
@@ -375,7 +364,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.data)
     this.productData(this.data.sa_quotedpriceid)
   }
 }

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -168,7 +168,6 @@ export default {
   methods:{
     onShow(){
      /* this.dialogProjectVisible = true*/
-      console.log(this.id,"项目编号")
       this.$emit('checkForm')
       /*this.productData()*/
 
@@ -185,34 +184,25 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        console.log(res)
         this.dialogProductVisible = false
         this.$emit('productAdd')
       })
     },
     /*获取产品信息*/
     queryProduct(id,type){
-      console.log(id,type)
       this.dialogProductVisible = true
       this.params.content.sa_projectid = 0
-      console.log(id,"报价单id五")
       this.type = type
-      console.log(this.type)
       this.sa_quotedpriceid = id
       this.productData()
     },
     /*产品配置信息*/
     async productData(){
-      console.log("执行")
-      console.log(this.sa_quotedpriceid,"报价单id四")
       this.params.content.sa_quotedpriceid = this.sa_quotedpriceid
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      console.log(res,'产品配置信息')
-      console.log(this.type)
       this.$nextTick(()=>{
-        console.log(this.type)
         if (this.type === '项目报价'){
           for (let i=0;i<this.list.length;i++){
             this.$refs.multipleTable.toggleRowSelection(this.list[i],true)
@@ -235,7 +225,6 @@ export default {
       this.productData()
     },
     clearData(){
-      console.log("执行")
       this.search = ""
       this.param.content.where.condition = this.search
       this.productData()
@@ -245,7 +234,6 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val)
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -259,7 +247,6 @@ export default {
             qty:e.qty
           }
         })
-        console.log(obj)
         this.selectData = obj
       }else {
         let obj = this.tableSelectData.map(e=>{
@@ -273,7 +260,6 @@ export default {
             qty:1
           }
         })
-        console.log(obj)
         this.selectData = obj
       }
     }

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -168,7 +168,6 @@ export default {
   methods:{
     onShow(){
      /* this.dialogProjectVisible = true*/
-      console.log(this.id,"项目编号")
       this.$emit('checkFormProject','project')
       /*this.productData()*/
 
@@ -185,34 +184,25 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        console.log(res)
         this.dialogProductVisible = false
         this.$emit('productAdd')
       })
     },
     /*获取产品信息*/
     queryProduct(id,type){
-      console.log(id,type)
       this.dialogProductVisible = true
       this.params.content.sa_projectid = this.id
-      console.log(id,"报价单id五")
       this.type = type
-      console.log(this.type)
       this.sa_quotedpriceid = id
       this.productData()
     },
     /*产品配置信息*/
     async productData(){
-      console.log("执行")
-      console.log(this.sa_quotedpriceid,"报价单id四")
       this.params.content.sa_quotedpriceid = this.sa_quotedpriceid
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      console.log(res,'产品配置信息')
-      console.log(this.type)
       this.$nextTick(()=>{
-        console.log(this.type)
         if (this.type === '项目报价'){
           for (let i=0;i<this.list.length;i++){
             this.$refs.multipleTable.toggleRowSelection(this.list[i],true)
@@ -234,7 +224,6 @@ export default {
       this.productData()
     },
     clearData(){
-      console.log("执行")
       this.search = ""
       this.param.content.where.condition = this.search
       this.productData()
@@ -244,7 +233,6 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val)
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -258,7 +246,6 @@ export default {
             qty:e.qty
           }
         })
-        console.log(obj)
         this.selectData = obj
       }else {
         let obj = this.tableSelectData.map(e=>{
@@ -272,7 +259,6 @@ export default {
             qty:1
           }
         })
-        console.log(obj)
         this.selectData = obj
       }
     }

src/SDrpManagement/QuotedPrice/components/projectTable.vue

@@ -70,7 +70,6 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(res)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -83,13 +82,11 @@ export default {
       this.projectList()
     },
     selectProject(val){
-      console.log("选择")
       this.$emit('projectData',val)
       this.dialogProjectVisible = false
 
     },
     onColes(){
-      console.log("关闭")
       this.dialogProjectVisible = false
       this.$emit('projectList')
     },

src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -226,21 +226,6 @@ export default {
     }
   },
   methods:{
-    /*/!*产品配置信息新增初始化*!/
-    async productInitialization(id){
-      this.param.content.sa_quotedpriceid = id
-      const res = await this.$api.requested(this.param)
-      this.list = res.data
-      this.total = res.total
-      this.totalPrice = 0
-
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
-      }
-      this.$emit("queryTotalPrice",totalPrice)
-      console.log(this.list,totalPrice,'产品配置信息')
-    },*/
     productAddF(){
       this.productData()
     },
@@ -249,33 +234,16 @@ export default {
     },
     /*产品配置信息*/
     async productData(){
-      console.log(this.id,"配置信息")
       this.param.content.sa_quotedpriceid = this.sa_quotedpriceid
-      console.log(this.param,"param数据")
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
-        console.log(this.list[i].discountrate,"循环折扣")
         this.list[i].discountrate = this.list[i].discountrate * 100
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
-      console.log(this.list,'产品配置信息')
     },
-   /* /!*修改折扣或单价的时候刷新*!/
-    async productDiscountrateData(id){
-      this.param.content.sa_quotedpriceid = id
-      const res = await this.$api.requested(this.param)
-      this.list = res.data
-      this.total = res.total
-      this.totalPrice = 0
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
-      }
-      console.log(this.list,'产品配置信息')
-    },*/
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
@@ -303,17 +271,14 @@ export default {
       this.productData()
     },
     selectionChange(val){
-      console.log(val,'选择')
       for (let i=0;i<val.length;i++){
         this.selectDel[i] = val[i].sa_quotedprice_itemsid
       }
-      console.log(this.selectDel)
     },
     checkForm(){
       this.$emit('checkForm')
     },
     checkFormProject(type){
-      console.log(type+'type')
       this.$emit('checkFormProject',type)
     },
     checkFormImport(){
@@ -325,8 +290,6 @@ export default {
     },
     quoterPrice(sa_quotedpriceid,type,btntype){
       this.sa_quotedpriceid = sa_quotedpriceid
-      console.log(sa_quotedpriceid,"报价单id")
-      console.log(btntype,"项目报价")
       btntype === 'project'?this.$refs.quoterPriceProject.queryProduct(sa_quotedpriceid,type):this.$refs.quoterPrice.queryProduct(sa_quotedpriceid,type)
 
     },
@@ -341,7 +304,6 @@ export default {
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
-      console.log(val,data,index)
       if (val > 100){
         data.discountrate = 100
         val = 100
@@ -352,7 +314,6 @@ export default {
       data.price = data.marketprice * (val / 100)
       data.amount = (data.qty * data.price).toFixed(2)
       data.discountDifferenceAmount = (data.discountrate - (data.mindiscountrate * 100))/100 * data.marketprice
-      console.log(data.discountDifferenceAmount,"差额")
       if (data.discountDifferenceAmount < 0){
         data.specialoffer =1
       }
@@ -394,7 +355,6 @@ export default {
       this.changeDiscountrateData(obj)
     },
     async changeData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -403,11 +363,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productData(res.data[0].sa_quotedpriceid)
     },
     async changeDiscountrateData(obj){
-      console.log(this.list,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "version":1,
@@ -416,11 +374,9 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.productDiscountrateData(res.data[0].sa_quotedpriceid)
     },
     async deleteProduct(val){
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "version":1,

src/SDrpManagement/QuotedPrice/detail/components/submitTo.vue

@@ -1,8 +1,6 @@
 <template>
   <div>
-    <el-popconfirm title="确定提交该报价单吗？" @confirm="CheckRow()">
-      <el-button slot="reference" size="mini" type="primary" style="width:100%">提 交</el-button>
-    </el-popconfirm>
+      <el-button size="mini" type="primary" style="width:100%" @click="onShow">提 交</el-button>
   </div>
 </template>
 
@@ -11,6 +9,20 @@ export default {
   name: "submitTo",
   props:["sa_quotedpriceid"],
   methods:{
+    onShow(){
+      this.$confirm('确定提交该报价单吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.CheckRow()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消提交'
+        });
+      });
+    },
     async CheckRow(){
       console.log("报价单id"+this.sa_quotedpriceid)
       const res = await this.$api.requested({

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -23,9 +23,9 @@
         <!-- 此区域提供了自定义操作按钮 -->
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
         <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') " :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 !== '新建'" :data="mainData" @onDeApprove="onSuccess"></deApprove>
+        <copyTo class="inline-16" v-if="tool.checkAuth($route.name,'copyTo') " :data="mainData.sa_quotedpriceid" ></copyTo>
       </div>
       <div slot="slot1" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -360,9 +360,9 @@ export default {
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
         ],
-        name:[
+        /*name:[
           { required: true, message: '请选择联系人', trigger: 'change'},
-        ]
+        ]*/
       },
     }
   },
@@ -373,8 +373,6 @@ export default {
     },
     /*创建报价单，获取商品信息*/
     onSubmit(type){
-      console.log(this.form,"表单123444")
-      console.log(this.date)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -384,7 +382,6 @@ export default {
         this.form.enddate = this.date[1]
         this.form.sa_quotedpriceid = 0
       }
-      console.log(this.form,"表单123")
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
@@ -392,7 +389,6 @@ export default {
           "version":1,
           "content": this.form
         })
-        console.log(res,"报价单创建数据")
         setTimeout(()=>{
           this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type,type)
           this.form.sa_quotedpriceid = res.data.sa_quotedpriceid
@@ -401,7 +397,6 @@ export default {
     },
     /*导入创建报价单校验*/
     onCheckFormImport(){
-      console.log(this.date)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -409,7 +404,6 @@ export default {
         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({
@@ -424,7 +418,6 @@ export default {
    /*提交*/
     getSubmit(){
       this.drawer = false
-      console.log(this.data)
       if (this.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -432,7 +425,6 @@ export default {
         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({
@@ -447,7 +439,6 @@ export default {
     },
     /*修改后的产品数据*/
     productDataChange(val){
-      console.log(val,"修改后的产品数据")
       let obj = val.map(e=>{
         return {
           sa_quotedprice_itemsid:e.sa_quotedprice_itemsid,
@@ -461,7 +452,6 @@ export default {
       this.productObj = obj
     },
     async changeData(obj){
-      console.log(this.productObj,"数据")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {
@@ -469,18 +459,15 @@ export default {
           "items":obj
         }
       })
-      console.log(res)
       this.$emit('addSuccess')
     },
     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.projectParam.content.where.condition = this.form.projectname
       this.projectList()
     },
@@ -581,7 +568,6 @@ export default {
   },
   mounted() {
     if (this.drawerShow){this.drawer = true}
-    console.log(this.typeData)
     this.form.type = this.typeData
     if (this.typeData === '项目报价'){
       this.isQuotedPrice = true
@@ -591,10 +577,8 @@ export default {
       this.title = '新建客户报价单'
     }
     const date = new Date()
-    console.log(date)
     this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
     this.form.sa_quotedpriceid = 0
-    console.log(this.form,"保定11111")
   },
   created() {
 

src/style/style.css

@@ -56,7 +56,7 @@ ul{
 .flex-align-start{
   display: flex;
   flex-wrap: wrap;
-  align-items: start;
+  align-items: flex-start;
 }
 .flex-between{
   justify-content: space-between;