Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/contractManage/components/productDetailList/addProduct.vue

@@ -102,7 +102,8 @@ export default {
                 "itemid": data.itemid,
                 "price": data.marketprice,
                 "qty": 1,
-                'marketprice':data.marketprice
+                'marketprice':data.marketprice,
+                type:'折扣系数'
               }
             ]
         },
@@ -119,7 +120,8 @@ export default {
           "itemid": item.itemid,
           "price": item.marketprice,
           "qty": 1,
-          'marketprice':item.marketprice
+          'marketprice':item.marketprice,
+          type:'折扣系数'
         }
       })
       let res = await this.$api.requested({

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -21,14 +21,21 @@
               :deletebtn="false"
             ></previewImage>
           </div>
+          <div v-else-if="scope.column.columnname == 'type'">
+            <el-select v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="scope.column.data.type">
+              <el-option label="折扣系数" value="折扣系数"></el-option>
+              <el-option label="指定单价" value="指定单价"></el-option>
+            </el-select>
+            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+          </div>
           <div v-else-if="scope.column.columnname == 'discountrate'">
 <!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @input="discountrateChange($event,scope.column.data)"></el-input>-->
-            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @change="discountrateChange($event,scope.column.data)"></el-input>
+            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid && scope.column.data.type == '折扣系数'" v-model="form.discountrate" @change="discountrateChange($event,scope.column.data)"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
 <!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @input="priceChange($event,scope.column.data)"></el-input>-->
-            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @change="priceChange($event,scope.column.data)"></el-input>
+            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid && scope.column.data.type == '指定单价'" v-model="form.price" @change="priceChange($event,scope.column.data)"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'countPrice'">
@@ -40,7 +47,7 @@
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
         <template v-slot:opreation="scope">
-          <el-button v-if="editIndex == scope.data.sa_contract_itemsid" type="text" size="mini" @click="save" class="inline-16">保 存</el-button>
+          <el-button v-if="editIndex == scope.data.sa_contract_itemsid" type="text" size="mini" @click="save(scope.data)" class="inline-16">保 存</el-button>
           <slot name="edit" :data="scope.data" v-else></slot>
           <slot name="del" :data="scope.data"></slot>
           <!-- <edit :data="scope.data"></edit> -->
@@ -87,6 +94,7 @@ export default {
         qty:'',
         discountrate:'',
         price:'',
+        type:''
       },
       tablecols:[],
       total:0,
@@ -143,8 +151,11 @@ export default {
       console.log(this.form.price,data.marketprice);
       
     },
-    async save () {
+    async save (data) {
+      console.log(data);
+      
       this.form.discountrate = (this.form.discountrate/100).toFixed(4)
+      this.form.type = data.type
       let res = await this.$api.requested({
         "id": 20221122200302,
         "content": {
@@ -161,10 +172,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.listData()
     },
   },
 };

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -215,7 +215,8 @@ export default {
                 "price": data.price,
                 "qty": data.qty,
                 "marketprice":data.marketprice,
-                "discountrate":data.discountrate
+                "discountrate":data.discountrate,
+                "type":'折扣系数'
               }
             ]
         },

src/HDrpManagement/contractManage/modules/detail.vue

@@ -443,10 +443,10 @@ export default {
             label:'签约日期',
             value:this.mainData.signdate
           },
-          {
-            label:'签约金额(元)',
-            value:this.mainData.signamount?this.mainData.signamount:0
-          },
+          // {
+          //   label:'签约金额(元)',
+          //   value:this.mainData.signamount?this.mainData.signamount:0
+          // },
           {
             label:'业务员',
             value:this.mainData.salername

src/HDrpManagement/dispatch/details/index.vue

@@ -122,7 +122,7 @@ import { log } from '@antv/g2plot/lib/utils'
           },
           {
             label:'发货金额',
-            value:this.tool.formatAmount(this.mainData.sumamount,2),
+            value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--',
           },
           {
             label:'运费状态',

src/HDrpManagement/dispatch/index.vue

@@ -38,7 +38,7 @@
             <span style="color:#b2c0ea" 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 == 'sumamount'">
-            {{ tool.formatAmount(scope.data.column.data.sumamount,2) }}
+            {{ scope.data.column.data.sumamount ? tool.formatAmount(scope.data.column.data.sumamount,2) : '--' }}
           </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}

src/HDrpManagement/dispatch/modules/edit.vue

@@ -35,7 +35,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
-              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -65,6 +73,16 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <div class="container" style="text-align:right">
+                <el-pagination
+                  background
+                  small
+                  :current-page="addressparam.content.pageNumber"
+                  @current-change="addresPageChange"
+                  layout="total,prev, pager, next"
+                  :total="addresstotal">
+                </el-pagination>
+              </div>
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
           </div>
@@ -85,6 +103,10 @@
           <p>预付</p>
         </div>
       </div>
+      <div class="mt-10">
+        <p class="normal-title inline-16">备注</p>
+      </div>
+      <el-input style="margin-bottom:10px" v-model="defaultData.remarks" type="textarea" placeholder="请输入备注"></el-input>
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">发货单产品</p>
@@ -132,39 +154,49 @@ export default {
         re_info:{},
         logist_info:{},
         billdate:(new Date()).toISOString().split('T')[0],
-        freightstatus:''
+        freightstatus:'',
+        remarks:''
       },
       setcol:24,
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < (Date.now() - 24 * 3600 * 1000);
         },
-      }
+      },
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
+      addresstotal:0
     }
   },
   methods:{
+    addresPageChange (n) {
+      this.addressparam.content.pageNumber = n
+      this.receiveAddress()
+    },
     onShow () {
       this.receiveAddress()
       this.queryLogisticcom()
       this.defaultData.freightstatus = this.data.freightstatus
+      this.defaultData.remarks = this.data.remarks
     },
 
    // 收货信息:合作企业联系人
    async receiveAddress () {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-          "nocache":true,
-          "pageNumber":1,
-          "pageSize":9999999,
-          "sys_enterpriseid":this.data.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":1
-          }
-        }
-      })
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
       this.receiveAddresslist = res.data
+      this.addresstotal = res.total
       this.defaultData.re_info = this.data.recvice
     },
     // 物流企业
@@ -190,7 +222,7 @@ export default {
           "rec_contactsid":this.defaultData.re_info.contactsid,
           "billdate":this.defaultData.billdate,
           "freightstatus":this.defaultData.freightstatus,
-          "remarks":""
+          "remarks":this.defaultData.remarks
         },
       })
       this.tool.showMessage(res,()=>{

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTable.vue

@@ -53,8 +53,8 @@
         width="250">
         <template slot-scope="scope">
           <div class="inline-16" v-if="data.byhand == 0">
-            <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">纸票pdf</a>
-            <a class="table_row_link inline-16" :href="scope.row.pdfurl">发票pdf</a>
+            <a class="table_row_link inline-16" :href="scope.row.paperpdfurl" v-if="scope.row.paperpdfurl">纸票pdf</a>
+            <a class="table_row_link inline-16" :href="scope.row.pdfurl" v-if="scope.row.pdfurl">发票pdf</a>
           </div>
           <div class="inline-16" v-else>
             <!-- <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">上传发票</a> -->

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

@@ -5,10 +5,34 @@
       <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status != '提交'" @click="addInvoiceapp2">添加发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status !== '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status !== '提交' && data.status != '审核')" @click="dialogFormVisible=true">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :data="data" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="data.status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>
+
+    <el-dialog append-to-body :visible.sync="dialogFormVisible" width="500px">
+      <div slot="title" style="font-size: 15px">
+        操作
+      </div>
+      <el-row :gutter="20">
+        <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="billinfono">
+              <el-input v-model="form.billinfono" placeholder="单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="form.remarks" placeholder="备注"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="blueInvioceToRed" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -25,7 +49,18 @@ export default {
   data () {
     return {
       sa_invoicebillid:0,
-      selectData:[]
+      selectData:[],
+      form: {
+        "sa_invoicebillids":[],
+        "billinfono":"",
+        "remarks":""
+      },
+      dialogFormVisible:false,
+      rules:{
+        billinfono:[
+          { required: true, message: '请输入单号', trigger: 'blur'},
+        ],
+      }
     }
   },
   methods:{
@@ -97,16 +132,16 @@ export default {
     },
     // 红冲蓝字发票
     async blueInvioceToRed () {
+      this.form.sa_invoicebillids = this.selectData.map(e=>{
+        return e.sa_invoicebillid
+      })
       const res = await this.$api.requested({
         "id": "20221226091503",
-        "content": {
-          "sa_invoicebillids":this.selectData.map(e=>{
-            return e.sa_invoicebillid
-          })
-        }
+        "content": this.form
       })
       this.tool.showMessage(res,()=>{
         this.$refs['invoiceTable'].listData()
+        this.dialogFormVisible = false
       })
     },
     mxOnSuccess () {

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -11,7 +11,7 @@
       @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" class="demo-form-inline" size="small" label-position="right" label-width="80px">
+          <el-form :model="form" :rules="rules" ref="form" class="demo-form-inline" size="small" label-position="right" label-width="110px">
             <el-col :span="12">
               <p class="normal-title normal-margin">企业信息</p>
               <el-form-item label="选择企业" prop="enterprisename">
@@ -56,6 +56,36 @@
                 <el-input readonly v-model="form.bankcardno" placeholder="开户账号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票种类">
+                <el-select v-model="form.invoiceline" placeholder="请选择发票种类">
+                  <el-option label="s/专用发票" value="s">
+                  </el-option>
+                  <el-option label="p/普通发票(电票)" value="p">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票限额">
+                <el-input  v-model.number="form.quota" placeholder="发票限额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票复核人">
+                <el-input  v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票收款人">
+                <el-input  v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票开票员">
+                <el-input  v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
@@ -92,13 +122,21 @@ export default {
       visible:false,
       visible1:false,
       form:{
-        enterprisename:'',
-        taxno:'',
-        sa_invoiceapplyid:0,
-        remarks:'',
-        byhand:false,
-        invoiceline:'s',
-        quota:"10000000",
+        "sa_invoiceapplyid":0,     //sa_brandid<=0时 为新增
+        "byhand":false,
+        "invoiceline":"s",
+        "remarks":"",
+        "quota":1000000,
+        "invoicepayee":"",
+        "invoiceclerk":"",
+        "invoicechecker":"",
+
+        "enterprisename":"",
+        "taxno":"",
+        "address":"",
+        "bank":"",
+        "bankcardno":"",
+        "phonenumber":""
       },
       accountAmount:'',
       value:'',

src/HDrpManagement/invoiceapp/modules/edit.vue

@@ -10,7 +10,7 @@
       size="700px">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" class="demo-form-inline" size="small" label-position="right" label-width="80px">
+          <el-form :model="form" :rules="rules" class="demo-form-inline" size="small" label-position="right" label-width="110px">
             <el-col :span="12">
               <p class="normal-title normal-margin">企业信息</p>
               <el-form-item label="选择企业">
@@ -55,6 +55,36 @@
                 <el-input readonly v-model="form.bankcardno" placeholder="开户账号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票种类">
+                <el-select v-model="form.invoiceline" placeholder="请选择发票种类">
+                  <el-option label="s/专用发票" value="s">
+                  </el-option>
+                  <el-option label="p/普通发票(电票)" value="p">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票限额">
+                <el-input  v-model.number="form.quota" placeholder="发票限额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票复核人">
+                <el-input  v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票收款人">
+                <el-input  v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票开票员">
+                <el-input  v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
@@ -100,9 +130,21 @@ export default {
       visible:false,
       visible1:false,
       form:{
-        sa_invoiceapplyid:0,
-        remarks:'',
-        byhand:false,
+        "sa_invoiceapplyid":0,     //sa_brandid<=0时 为新增
+        "byhand":false,
+        "invoiceline":"s",
+        "remarks":"",
+        "quota":1000000,
+        "invoicepayee":"",
+        "invoiceclerk":"",
+        "invoicechecker":"",
+
+        "enterprisename":"",
+        "taxno":"",
+        "address":"",
+        "bank":"",
+        "bankcardno":"",
+        "phonenumber":""
       },
       accountAmount:'',
       value:'',

src/HDrpManagement/logistics/details/index.vue

@@ -18,7 +18,7 @@
         <div slot="customOperation" >
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec') && mainData.status =='审核'" :disabled="mainData.status == '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status != '新建'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>

src/HDrpManagement/logistics/modules/add.vue

@@ -45,7 +45,7 @@
           <el-input v-model.number="form.freightamount" placeholder="运费"></el-input>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model.number="form.remarks" placeholder="运费"></el-input>
+          <el-input v-model.number="form.remarks" placeholder="备注"></el-input>
         </el-form-item>
         <el-form-item label="单据日期" prop="billdate">
           <el-date-picker
@@ -147,6 +147,7 @@ export default {
         return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1));
       }
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
+      this.form.remarks = this.$refs['dislist'].tableData[0].remarks
     },
     async onSubmit () {
       this.form.sa_dispatchids = this.$refs['dislist'].tableData.map(e=>{

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -42,6 +42,10 @@
       prop="address"
       label="地址">
     </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="备注">
+    </el-table-column>
     <el-table-column
     v-if="type === 'edit'"
     label="操作"

src/HDrpManagement/logistics/modules/edit.vue

@@ -55,7 +55,7 @@ ed<template>
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model.number="form.remarks" placeholder="运费"></el-input>
+          <el-input v-model.number="form.remarks" placeholder="备注"></el-input>
         </el-form-item>
       </el-form>
       <div class="mt-10">
@@ -170,6 +170,8 @@ export default {
         return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1));
       }
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
+      this.form.remarks = this.$refs['dislist'].tableData[0].remarks
+
     },
     async onSubmit () {
       this.form.sa_dispatchids = this.$refs['dislist'].tableData.map(e=>{

src/HDrpManagement/orderManage/details/index.vue

@@ -24,7 +24,6 @@
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
             placement="top"
-            v-model="visible"
             trigger="click">
             <p  class="mt-10 normal-title">选择评审类型</p>
             <el-select class="mt-10" v-model="value" placeholder="请选择" size="mini">
@@ -53,7 +52,7 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot0">
-        <product-list @select="select" :data="mainData" ref="prod">
+        <product-list @select="select" @onSuccess="queryMainData()" :data="mainData" ref="prod">
           <div slot="operation">
             <changeOrderMx v-if="mainData.status === '审核'" class="inline-16" :data="selection" @onSuccess="$refs['prod'].listData()"></changeOrderMx>
             <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>

src/HDrpManagement/orderManage/details/tabs/defaultInfo.vue

@@ -20,13 +20,17 @@
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
+      
+
+    </el-descriptions>
+    <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">系统信息</div>
       <el-descriptions-item label="创建人">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
       <el-descriptions-item label="创建时间">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
       <el-descriptions-item label="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
       <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
       <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
       <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
-
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -36,7 +36,8 @@
         <el-table-column
           prop="itemno"
           label="产品编号"
-          width="180">
+          width="180"
+          fixed="left">
         </el-table-column>
         <el-table-column
           prop="erpitemno"
@@ -51,16 +52,6 @@
             <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="qty"
-          label="数量"
-          width="180">
-          <template slot-scope="scope">
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <!-- <span v-else>{{scope.row.qty}}</span> -->
-          </template>
-        </el-table-column>
         <el-table-column
           prop="needdate"
           label="需求日期"
@@ -149,6 +140,16 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="qty"
+          label="数量"
+          width="180">
+          <template slot-scope="scope">
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <!-- <span v-else>{{scope.row.qty}}</span> -->
+          </template>
+        </el-table-column>
         <el-table-column
           prop="marketprice"
           label="牌价"
@@ -162,7 +163,8 @@
           label="折前价格"
           width="100">
           <template slot-scope="scope">
-            <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
+            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.row.defaultprice"  placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+            <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
           </template>
         </el-table-column>
         <el-table-column
@@ -170,7 +172,7 @@
           label="折前金额"
           width="100">
           <template slot-scope="scope">
-            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
+            <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultamount,2)}}</p>
           </template>
         </el-table-column>
         <el-table-column
@@ -178,8 +180,7 @@
           label="折后价格"
           width="100">
           <template slot-scope="scope">
-            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.row.price"  placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-            <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+            <p>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
         <!-- <el-table-column
@@ -206,6 +207,16 @@
           label="库存状态"
           width="100">
         </el-table-column>
+        <el-table-column
+          prop="invoiceamount"
+          label="已开票金额"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="writeoffamount"
+          label="已核销金额"
+          width="100">
+        </el-table-column>
         <el-table-column
           label="备注"
           width="300"
@@ -272,7 +283,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 9999,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -304,7 +315,7 @@ export default {
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     async deleteOrderProduct (row) {
@@ -348,7 +359,8 @@ export default {
             "qty": val.qty, //数量
             "needdate": val.needdate,//可以不传,修改交期
             "price":val.price,
-            "remarks":val.remarks
+            "remarks":val.remarks,
+            "defaultprice":val.defaultprice
           }]
         },()=>{
           this.$set(this.tableData,index,val)
@@ -376,6 +388,7 @@ export default {
         "content": val
       })
       this.$emit('onSuccess')
+      this.listData()
       res.code === 1?fn():""
     },
     async dateChangeNeed(val){

src/HDrpManagement/orderManage/modules/edit.vue

@@ -114,7 +114,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
-              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -144,6 +152,16 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <div class="container" style="text-align:right">
+                <el-pagination
+                  background
+                  small
+                  :current-page="addressparam.content.pageNumber"
+                  @current-change="addresPageChange"
+                  layout="total,prev, pager, next"
+                  :total="addresstotal">
+                </el-pagination>
+              </div>
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
           </div>
@@ -264,6 +282,20 @@ export default {
       saletype:"",
       saler_name:"",
       billdate:'',
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
+      addresstotal:0
     }
   },
   mounted () {
@@ -273,6 +305,10 @@ export default {
     this.queryBasicInfo()
   },
   methods:{
+    addresPageChange (n) {
+      this.addressparam.content.pageNumber = n
+      this.receiveAddress()
+    },
     async queryBasicInfo () {
       const res = await this.$api.requested({
         "id":20220920084001,"content":{
@@ -321,16 +357,9 @@ export default {
     },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
-      const res = await this.$api.requested({
-        "id": "20230220002602",
-        "content": {
-          "nocache":true,
-          "sys_enterpriseid": this.data.sys_enterpriseid,
-          "where": {
-              "condition": ""
-          }
-        },
-      })
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
     },
 

src/HManagement/marketing2/agent/details/modules/address/add.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="normal-margin">
+  <div>
     <el-button type="primary" size="small" @click="onShow(dialogFormVisible = true)">添加地址</el-button>
     <el-dialog title="新建地址" append-to-body :visible.sync="dialogFormVisible" width="800px">
       <el-row :gutter="20">

src/HManagement/marketing2/agent/details/modules/bankInfo/add.vue

@@ -48,7 +48,8 @@ export default {
         "bank": "",
         "bankcardno": "",
         "name": "",
-        "phonenumber": ""
+        "phonenumber": "",
+        "sys_enterpriseid":''
       },
       rules:{
         bank:[
@@ -71,6 +72,7 @@ export default {
       console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+        this.form.sys_enterpriseid = this.$route.query.id
         const res = await this.$api.requested({
           "id": "20221022165703",
           "version":1,

src/HManagement/marketing2/agent/details/modules/bankInfo/index.vue

@@ -95,6 +95,7 @@ export default {
       })
     },
     async listData(){
+      this.params.content.sys_enterpriseid = this.$route.query.id
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -34,9 +34,14 @@
         <span style="color:#888;font-size: 14px;margin-left: 10px">起订量：{{selectProduct.orderminqty}}</span>
         <span style="color:#888;font-size: 14px;margin-left: 10px">增量：{{selectProduct.orderaddqty}}</span>
         <span style="color:#888;font-size: 14px;margin-left: 10px">库存：
-          <span v-if="selectProduct.stockstatus === '紧缺'" style="color: red">{{selectProduct.stockstatus}}</span>
-          <span v-else-if="selectProduct.stockstatus === '充足'" style="color: green">{{selectProduct.stockstatus}}</span>
-          <span v-else>{{selectProduct.stockstatus}}</span>
+          <template v-if="usertype === 0 || usertype === 1">
+            <span>{{ selectProduct.cansaleqty }}</span>
+          </template>
+          <template v-else>
+            <span v-if="selectProduct.stockstatus === '紧缺'" style="color: red">{{selectProduct.stockstatus}}</span>
+            <span v-else-if="selectProduct.stockstatus === '充足'" style="color: green">{{selectProduct.stockstatus}}</span>
+            <span v-else>{{selectProduct.stockstatus}}</span>
+          </template>
         </span>
       </div>
 

src/SDrpManagement/ProductGroup/modules/classTree.vue

@@ -50,7 +50,7 @@ export default {
 }
 .classItem{
   flex: 0 1 auto;
-  width:80px ;
+  width:110px ;
   margin:10px 0px 10px 0;
   font-size:14px !important;
   cursor: pointer;

src/SDrpManagement/agentOrder/details/tabs/invoiceTable.vue

@@ -56,6 +56,7 @@
         @current-change="handleCurrentChange"
         :current-page="currentPage"
         :page-sizes="[20, 50, 100, 200]"
+        :pager-count="15"
         layout="total,sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>

src/SDrpManagement/agentOrder/index.vue

@@ -33,6 +33,28 @@
             <el-option value="工具订单" label="工具订单"></el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <p class="search__label">核销状态:</p>
+          <el-select 
+            v-model="writeoffstatus" 
+            clearable style="margin-right:10px" 
+            size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.writeoffstatus = writeoffstatus;$refs.basicLayout.listData()">
+            <el-option label="已核销" value="已核销"></el-option>
+            <el-option label="部分核销" value="部分核销"></el-option>
+            <el-option label="未核销" value="未核销"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <p class="search__label">开票状态:</p>
+          <el-select 
+            v-model="invoicestatus" 
+            clearable style="margin-right:10px" 
+            size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.invoicestatus = invoicestatus;$refs.basicLayout.listData()">
+            <el-option label="已开票" value="已开票"></el-option>
+            <el-option label="部分开票" value="部分开票"></el-option>
+            <el-option label="未开票" value="未开票"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
@@ -89,6 +111,8 @@ export default {
       options:[],
       status:'',
       type:'',
+      writeoffstatus:'',
+      invoicestatus:'',
       dateSelect:[]
     }
   },

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -93,6 +93,7 @@
                   </template>
                 </el-table-column>
               </el-table>
+              
               <el-button slot="reference" type="text" size="mini">选择其他</el-button>
             </el-popover>
           </div>
@@ -114,7 +115,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
-              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -144,6 +153,16 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <div class="container" style="text-align:right">
+                <el-pagination
+                  background
+                  small
+                  :current-page="addressparam.content.pageNumber"
+                  @current-change="addresPageChange"
+                  layout="total,prev, pager, next"
+                  :total="addresstotal">
+                </el-pagination>
+              </div>
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
           </div>
@@ -251,13 +270,31 @@ export default {
       isusedrebate:0,
       signbackstatus:'不需要',
       saletype:"",
-      freefreightamount:''
+      freefreightamount:'',
+      addresstotal:0,
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      }
     }
   },
   created () {
     this.queryBasicInfo()
   },
   methods:{
+    addresPageChange (n) {
+      this.addressparam.content.pageNumber = n
+      this.receiveAddress()
+    },
     async queryBasicInfo () {
       const res = await this.$api.requested({
         "id":20220920084001,"content":{
@@ -288,19 +325,9 @@ export default {
     },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-          "nocache":true,
-          "pageNumber":1,
-          "pageSize":9999999,
-          "sys_enterpriseid":this.data.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":1
-          }
-        }
-      })
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
     },
 

src/SDrpManagement/salerOrder/index.vue

@@ -32,6 +32,28 @@
             <el-option value="工具订单" label="工具订单"></el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <p class="search__label">核销状态:</p>
+          <el-select 
+            v-model="writeoffstatus" 
+            clearable style="margin-right:10px" 
+            size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.writeoffstatus = writeoffstatus;$refs.basicLayout.listData()">
+            <el-option label="已核销" value="已核销"></el-option>
+            <el-option label="部分核销" value="部分核销"></el-option>
+            <el-option label="未核销" value="未核销"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <p class="search__label">开票状态:</p>
+          <el-select 
+            v-model="invoicestatus" 
+            clearable style="margin-right:10px" 
+            size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.invoicestatus = invoicestatus;$refs.basicLayout.listData()">
+            <el-option label="已开票" value="已开票"></el-option>
+            <el-option label="部分开票" value="部分开票"></el-option>
+            <el-option label="未开票" value="未开票"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
@@ -91,6 +113,8 @@ export default {
       options:[],
       status:'',
       type:'',
+      writeoffstatus:'',
+      invoicestatus:'',
       dateSelect:[]
       
     }

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -105,7 +105,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
-              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -135,6 +143,16 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <div class="container" style="text-align:right">
+                <el-pagination
+                  background
+                  small
+                  :current-page="addressparam.content.pageNumber"
+                  @current-change="addresPageChange"
+                  layout="total,prev, pager, next"
+                  :total="addresstotal">
+                </el-pagination>
+              </div>
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
           </div>
@@ -241,13 +259,31 @@ export default {
       isusedrebate:0,
       signbackstatus:'不需要',
       saletype:"",
-      freefreightamount:''
+      freefreightamount:'',
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
+      aaddresstotal:0
     }
   },
   created () {
     this.queryBasicInfo()
   },
   methods:{
+    addresPageChange (n) {
+      this.addressparam.content.pageNumber = n
+      this.receiveAddress()
+    },
     async queryBasicInfo () {
       const res = await this.$api.requested({
         "id":20220920084001,"content":{
@@ -294,22 +330,11 @@ export default {
     },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-          "nocache":true,
-          "pageNumber":1,
-          "pageSize":9999999,
-          "sys_enterpriseid":this.data.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":1
-          }
-        }
-      })
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
     },
-
     // 设置默认信息
     async setDefaultData () {
       this.defaultData.rebatebalance = this.data.rebatebalance

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'https://122.226.136.204:8079/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites