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

src/Form/publicCustomer/add.vue

@@ -302,7 +302,7 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" ></el-input>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" @input="telephoneChange('手机')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="!isPhone">
@@ -313,10 +313,10 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <div>
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:100px;margin-top: 10px" @input="telephoneChange"></el-input>
+                <div style="width: 100%">
+                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:345px;margin-top: 10px" @input="telephoneChange"></el-input>
+                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                 </div>
 
               </el-form-item>
@@ -777,8 +777,10 @@ export default {
       this.value = ''
     },
     onClose(){
-      this.$refs['form'].resetFields();
+      this.form.contactsinfo.telephone = ''
+      this.form.contactsinfo.phonenumber = ''
       this.isPhone = true
+      this.$refs['form'].resetFields();
       this.areaCode = ''
       this.telephone = ''
       this.dialogFormVisible = false
@@ -972,6 +974,8 @@ export default {
         this.isPhone = true
         this.form.contactsinfo.phonenumber = val.phonenumber
         this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
       }
       this.enterpriseContact.show = false
     },
@@ -985,8 +989,15 @@ export default {
       this.myContacts.param.content.pageNumber = val
       this.myContactList()
     },
-    telephoneChange(){
-      this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+    telephoneChange(val){
+      if (val === '座机'){
+        this.form.contactsinfo.phonenumber = ''
+        this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+      }else {
+        this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
+      }
     }
   },
   mounted() {

src/Form/publicCustomer/edit.vue

@@ -160,10 +160,10 @@
                   <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
                 </el-button-group>
-                <div>
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:100px;margin-top: 10px"  disabled></el-input>
+                <div style="width: 100%">
+                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px"  disabled></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:345px;margin-top: 10px"  disabled></el-input>
+                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px"  disabled></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -422,11 +422,11 @@ export default {
         this.form.grade = ''
       }
       this.form.contactsinfo.name = this.form.contactsinfo[0].name
-      if (this.form.contactsinfo[0].telephone){
+      if (this.form.contactsinfo[0].phonenumber.substring(0,this.form.contactsinfo[0].phonenumber.indexOf('-'))){
         this.isPhone = false
-         this.areaCode = this.form.contactsinfo[0].telephone.substring(0,this.form.contactsinfo[0].telephone.indexOf('-'))
-         this.telephone = this.form.contactsinfo[0].telephone.substring(this.areaCode.length+1)
-         this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+         this.areaCode = this.form.contactsinfo[0].phonenumber.substring(0,this.form.contactsinfo[0].phonenumber.indexOf('-'))
+         this.telephone = this.form.contactsinfo[0].phonenumber.substring(this.areaCode.length+1)
+         this.form.contactsinfo.phonenumber = this.areaCode + '-' + this.telephone
       }else {
         this.isPhone = true
         this.form.contactsinfo.phonenumber = this.form.contactsinfo[0].phonenumber

src/Form/salerPrivatecustomer/add.vue

@@ -301,7 +301,7 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" ></el-input>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" @input="telephoneChange('手机')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="!isPhone">
@@ -312,10 +312,10 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <div>
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:100px;margin-top: 10px" @input="telephoneChange"></el-input>
+                <div style="width: 100%">
+                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:335px;margin-top: 10px" @input="telephoneChange"></el-input>
+                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -700,30 +700,16 @@ export default {
      })
     },
     onClose () {
+      this.form.contactsinfo.telephone = ''
+      this.form.contactsinfo.phonenumber = ''
+      this.isPhone = true
       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:'',
-        ispublic:0
-      }*/
       this.dialogFormVisible = false
       this.checkResults = ''
       this.value = ''
       this.businessShow = false
+      this.areaCode = ''
+      this.telephone = ''
       this.$emit('onSuccess')
     },
     /*客户类型列表*/
@@ -911,6 +897,8 @@ export default {
         this.isPhone = true
         this.form.contactsinfo.phonenumber = val.phonenumber
         this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
       }
       this.enterpriseContact.show = false
     },
@@ -962,8 +950,15 @@ export default {
       this.myContacts.param.content.pageNumber = val
       this.myContactList()
     },
-    telephoneChange(){
-      this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+    telephoneChange(val){
+      if (val === '座机'){
+        this.form.contactsinfo.phonenumber = ''
+        this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+      }else {
+        this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
+      }
     }
   }
 }

src/Form/salerPrivatecustomer/edit.vue

@@ -159,10 +159,10 @@
                   <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
                 </el-button-group>
-                <div>
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:100px;margin-top: 10px"  disabled></el-input>
+                <div style="width: 100%">
+                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px"  disabled></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:335px;margin-top: 10px"  disabled></el-input>
+                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px"  disabled></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -381,11 +381,11 @@ export default {
         this.form.sa_agentsid  = ''
       }
       this.form.contactsinfo.name = this.form.contactsinfo[0].name
-      if (this.form.contactsinfo[0].telephone){
+      if (this.form.contactsinfo[0].phonenumber.substring(0,this.form.contactsinfo[0].phonenumber.indexOf('-'))){
         this.isPhone = false
-        this.areaCode = this.form.contactsinfo[0].telephone.substring(0,this.form.contactsinfo[0].telephone.indexOf('-'))
-        this.telephone = this.form.contactsinfo[0].telephone.substring(this.areaCode.length+1)
-        this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+        this.areaCode = this.form.contactsinfo[0].phonenumber.substring(0,this.form.contactsinfo[0].phonenumber.indexOf('-'))
+        this.telephone = this.form.contactsinfo[0].phonenumber.substring(this.areaCode.length+1)
+        this.form.contactsinfo.phonenumber = this.areaCode + '-' + this.telephone
       }else {
         this.isPhone = true
         this.form.contactsinfo.phonenumber = this.form.contactsinfo[0].phonenumber

src/HDrpManagement/invoicePredictionManage/details/modules/order.vue

@@ -604,6 +604,7 @@ export default {
           "id": 20230705145404,
           "content": {
             "sa_salesforecastbillid":this.id,
+            "sa_salesforecastprojectid":this.productsParam.content.sa_salesforecastprojectid,
             "sa_salesforecastids":items
           }
         })
@@ -624,6 +625,7 @@ export default {
         "id": 20230705145404,
         "content": {
           "sa_salesforecastbillid":this.id,
+          "sa_salesforecastprojectid":this.productsParam.content.sa_salesforecastprojectid,
           "sa_salesforecastids":[val.sa_salesforecastid]
         }
       })
@@ -645,7 +647,7 @@ export default {
           "salesforecast": [
             {
               "sa_salesforecastid":data.sa_salesforecastid,
-              "sa_orderitemsid": data.ownerid,
+              "sa_orderitemsid": data.sa_orderitemsid,
               "deliverydate":val
             }
           ]

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -15,10 +15,10 @@
         操作
       </div>
       <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+        <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
           <el-col :span="24">
-            <el-form-item label="单号" prop="invoiceserialnum">
-              <el-input v-model="form.invoiceserialnum" placeholder="单号"></el-input>
+            <el-form-item label="红冲流水号" prop="invoiceserialnum">
+              <el-input v-model="form.invoiceserialnum" placeholder="红冲流水号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -58,7 +58,7 @@ export default {
       dialogFormVisible:false,
       rules:{
         invoiceserialnum:[
-          { required: true, message: '请输入单号', trigger: 'blur'},
+          { required: true, message: '请输入红冲流水号', trigger: 'blur'},
         ],
       }
     }

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateRedInvioce">勾选创建发票</el-button>
+<!--      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateRedInvioce">勾选创建发票</el-button>-->
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">发票创建查询</el-button>
     </el-button-group>
     <invoiceTable class="normal-margin" :status="status" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
@@ -76,4 +76,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/projectPredictionManage/details/modules/projectListDetail.vue

@@ -235,9 +235,9 @@ export default {
       const res = await this.$api.requested(this.productParam)
       this.productList = res.data
      /* console.log(typeof res.data[4].marketprice)*/
-      this.productList.forEach(item=>{
+      /*this.productList.forEach(item=>{
         item.price = Number(this.tool.formatAmount(item.price,2))
-      })
+      })*/
       this.totalProduct = res.total
       if (res.data.length > 0){
         this.productPrice = res.data[0].sumorderamount
@@ -612,9 +612,9 @@ export default {
       }else if(val > data.marketprice){
         data.price = data.marketprice
       } else {
-        data.price = this.tool.formatAmount(val ,4)
+        data.price = Number(val).toFixed(4)
       }
-      data.orderamount = this.tool.formatAmount(data.price * data.orderqty,4)
+      data.orderamount = (data.price * data.orderqty).toFixed(4)
       this.$set(this.productList,index,data)
       /*setTimeout(()=>{*/
         this.onChangeQty(data)

src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -597,6 +597,7 @@ export default {
           "id": 20230705145404,
           "content": {
             "sa_salesforecastbillid":this.id,
+            "sa_salesforecastprojectid":this.productsParam.content.sa_salesforecastprojectid,
             "sa_salesforecastids":items
           }
         })
@@ -617,6 +618,7 @@ export default {
         "id": 20230705145404,
         "content": {
           "sa_salesforecastbillid":this.id,
+          "sa_salesforecastprojectid":this.productsParam.content.sa_salesforecastprojectid,
           "sa_salesforecastids":[val.sa_salesforecastid]
         }
       })
@@ -638,7 +640,7 @@ export default {
           "salesforecast": [
             {
               "sa_salesforecastid":data.sa_salesforecastid,
-              "sa_orderitemsid": data.ownerid,
+              "sa_orderitemsid": data.sa_orderitemsid,
               "deliverydate":val
             }
           ]

src/SDrpManagement/projectPrediction/detail/projectListDetail.vue

@@ -75,8 +75,8 @@
           <div v-else-if="scope.column.columnname === 'price'">
             <span v-if="isDisabled">¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
             <span v-else>
-            <el-input size="mini" v-model="scope.column.data.price" @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)"></el-input>
-          </span>
+              <el-input size="mini" v-model="scope.column.data.price" @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)"></el-input>
+            </span>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
@@ -240,9 +240,9 @@ export default {
       const res = await this.$api.requested(this.productParam)
       this.productList = res.data
      /* console.log(typeof res.data[4].marketprice)*/
-      this.productList.forEach(item=>{
+      /*this.productList.forEach(item=>{
         item.price = Number(this.tool.formatAmount(item.price,2))
-      })
+      })*/
       this.totalProduct = res.total
       if (res.data.length > 0){
         this.productPrice = res.data[0].sumorderamount
@@ -617,9 +617,9 @@ export default {
       }else if(val > data.marketprice){
         data.price = data.marketprice
       } else {
-        data.price = this.tool.formatAmount(val ,4)
+        data.price = Number(val).toFixed(4)
       }
-      data.orderamount = this.tool.formatAmount(data.price * data.orderqty,4)
+      data.orderamount = (data.price * data.orderqty).toFixed(4)
       this.$set(this.productList,index,data)
       /*setTimeout(()=>{*/
         this.onChangeQty(data)

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -251,7 +251,7 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" ></el-input>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" @input="telephoneChange('手机')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="!isPhone">
@@ -262,10 +262,10 @@
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
                 </el-button-group>
-                <div>
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:100px;margin-top: 10px" @input="telephoneChange"></el-input>
+                <div style="width: 100%">
+                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:345px;margin-top: 10px" @input="telephoneChange"></el-input>
+                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -521,6 +521,8 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.source = this.form.cluesource
       this.value = [this.form.province,this.form.city,this.form.county]
+      this.form.contactsinfo.name = this.data.name
+      this.form.contactsinfo.phonenumber = this.data.phonenumber
       this.gradeList()
       this.industryList()
       this.typeList()
@@ -788,6 +790,8 @@ export default {
         this.isPhone = true
         this.form.contactsinfo.phonenumber = val.phonenumber
         this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
       }
       this.enterpriseContact.show = false
     },
@@ -839,8 +843,16 @@ export default {
       this.myContacts.param.content.pageNumber = val
       this.myContactList()
     },
-    telephoneChange(){
-      this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+    telephoneChange(val){
+      if (val === '座机'){
+        this.form.contactsinfo.phonenumber = ''
+        this.form.contactsinfo.telephone = this.areaCode + '-' + this.telephone
+      }else {
+        this.form.contactsinfo.telephone = ''
+        this.areaCode = ''
+        this.telephone = ''
+      }
+
     }
   },
   mounted() {

src/components/duplicatesCheck/customerChangeCheck.vue

@@ -124,6 +124,10 @@ export default {
       });
     },
     async onSubmit(){
+      if (this.data.contactsinfo.telephone){
+        this.data.contactsinfo.phonenumber = this.data.contactsinfo.telephone
+        this.data.contactsinfo.telephone = ''
+      }
       const res = await this.$api.requested({
         "id": 20221216184302,
         "content": this.data

src/components/duplicatesCheck/customerCheck.vue

@@ -124,6 +124,10 @@ export default {
       });
     },
     async onSubmit(){
+      if (this.data.contactsinfo.telephone){
+        this.data.contactsinfo.phonenumber = this.data.contactsinfo.telephone
+        this.data.contactsinfo.telephone = ''
+      }
       const res = await this.$api.requested({
         "id": 20221012163902,
         "content": this.data

src/components/duplicatesCheck/publicCustomerCheck.vue

@@ -125,6 +125,10 @@ export default {
       });
     },
     async onSubmit(){
+      if (this.data.contactsinfo.telephone){
+        this.data.contactsinfo.phonenumber = this.data.contactsinfo.telephone
+        this.data.contactsinfo.telephone = ''
+      }
       const res = await this.$api.requested({
         "id": 20221010164302,
         "content": this.data