2023-4-11

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -2,12 +2,20 @@
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
     <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
-      <div class="flex-align-center">
+      <div class="flex-align-center" style="margin-bottom:16px">
         <el-input size="small"  
-          style="width:200px;margin-bottom:16px"
+          style="width:200px"
           suffix-icon="el-icon-search" 
           v-model="param.content.where.condition" 
           placeholder="订单号、产品编号、产品名称" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
+        <uploadAllData
+          class="inline-16"
+          :total="total"
+          dataType="订单"
+          @handlePullApi="handlePullApi"
+          @handleUploadApi="handleUploadApi"
+          @onSuccess="onSuccess"
+        ></uploadAllData>
       </div>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
@@ -48,8 +56,10 @@
 </template>
 
 <script>
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
   props:['sys_enterpriseid','status'],
+  components:{uploadAllData},
   data () {
     return {
       dialogTableVisible:false,
@@ -115,6 +125,32 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
       })
+    },
+    /*拉取数据*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = this.param.id
+    },
+    /*上传数据*/
+    handleUploadApi (uploadApi,data) {
+      uploadApi.id = 20221217091203
+      uploadApi.content = {
+        "sa_invoiceapplyid": this.$route.query.id, 
+        "iteminfos": data.map(item => {
+          return {
+            "sa_invoiceapply_orderid": 0, 
+            "saorderid": item.sa_orderid, 
+            "sa_orderitemsid": item.sa_orderitemsid, 
+            "price": item.price, 
+            "invoiceamount": 0, 
+            "invoiceaqty": 0
+          }
+        })
+      }
+    },
+    onSuccess () {
+      this.list = []
+      this.$emit('onSuccess')
     }
   },
   mounted () {

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

@@ -644,6 +644,7 @@ export default {
         clearTimeout(this.time);
       }
       this.time = setTimeout(() => {
+        val.amount = val.qty * val.price
         this.$set(this.tableData,index,val)
         that.updateOrder({
           "sa_orderid": this.data.sa_orderid, //订单ID

src/HDrpManagement/serveBill/modules/detail.vue

@@ -150,6 +150,8 @@ export default {
         {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : ''},
         {label:'应用系统',value:this.mainData.class1 ? this.mainData.class1 : ''},
         {label:'客诉大类',value:this.mainData.class2 ? this.mainData.class2 : ''},
+        {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+        {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
         {label:'申请原因',value:this.mainData.reason ? this.mainData.reason : ''},
        /*
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
@@ -209,8 +211,10 @@ export default {
             {label:'应用系统',value:this.mainData.class1},
             {label:'客诉大类',value:this.mainData.class2},
             {label:'申请原因',value:this.mainData.reason},
-            {label:'需求服务开始日期',value:this.mainData.begdate},
-            {label:'需求服务结束日期',value:this.mainData.enddate},
+            {label:'需求服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+            {label:'需求服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+            {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+            {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
             {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
           ]
         },

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -153,9 +153,11 @@ export default {
         {label:'服务联系电话',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
         {label:'应用系统',value:this.mainData.class1 ? this.mainData.class1 : ''},
         {label:'客诉大类',value:this.mainData.class2 ? this.mainData.class2 : ''},
-        {label:'需求服务开始日期',value:this.mainData.begdate ? this.mainData.begdate : ''},
-        {label:'需求服务结束日期',value:this.mainData.enddate ? this.mainData.enddate : ''},
+        {label:'需求服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+        {label:'需求服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
         {label:'申请原因',value:this.mainData.reason ? this.mainData.reason : ''},
+        {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+        {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
         {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
       ]
       this.detailInfo = [
@@ -176,8 +178,10 @@ export default {
             {label:'应用系统',value:this.mainData.class1},
             {label:'客诉大类',value:this.mainData.class2},
             {label:'申请原因',value:this.mainData.reason},
-            {label:'需求服务开始日期',value:this.mainData.begdate},
-            {label:'需求服务结束日期',value:this.mainData.enddate},
+            {label:'需求服务开始日期',value:this.mainData.begdate ? this.mainData.begdate.slice(0,this.mainData.begdate.indexOf(' ')) : ''},
+            {label:'需求服务结束日期',value:this.mainData.enddate ? this.mainData.enddate.slice(0,this.mainData.enddate.indexOf(' ')) : ''},
+            {label:'业务员',value:this.mainData.saler_name ? this.mainData.saler_name : ''},
+            {label:'业务员手机号',value:this.mainData.saler_phonenumber ? this.mainData.saler_phonenumber : ''},
             {label:'备注',value:this.mainData.remarks ? this.mainData.remarks : ''},
           ]
         },

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -445,6 +445,7 @@ export default {
         }
       }
       let that = this
+      val.amount = val.qty * val.price
       this.$set(this.tableData,index,val)
       // // 防抖
       if(this.time !== null){

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/components/addorderline.vue

@@ -2,12 +2,20 @@
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
     <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
-      <div class="flex-align-center">
+      <div class="flex-align-center" style="margin-bottom:16px">
         <el-input size="small"  
-          style="width:200px;margin-bottom:16px"
+          style="width:200px"
           suffix-icon="el-icon-search" 
           v-model="param.content.where.condition" 
           placeholder="订单号、产品编号、产品名称" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
+        <uploadAllData
+          class="inline-16"
+          :total="total"
+          dataType="订单"
+          @handlePullApi="handlePullApi"
+          @handleUploadApi="handleUploadApi"
+          @onSuccess="onSuccess"
+        ></uploadAllData>
       </div>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
@@ -47,8 +55,10 @@
 </template>
 
 <script>
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
   props:['sys_enterpriseid','status'],
+  components:{uploadAllData},
   data () {
     return {
       dialogTableVisible:false,
@@ -116,6 +126,32 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
       })
+    },
+    /*拉取数据*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = this.param.id
+    },
+    /*上传数据*/
+    handleUploadApi (uploadApi,data) {
+      uploadApi.id = 20221217091203
+      uploadApi.content = {
+        "sa_invoiceapplyid": this.$route.query.id, 
+        "iteminfos": data.map(item => {
+          return {
+            "sa_invoiceapply_orderid": 0, 
+            "saorderid": item.sa_orderid, 
+            "sa_orderitemsid": item.sa_orderitemsid, 
+            "price": item.price, 
+            "invoiceamount": 0, 
+            "invoiceaqty": 0
+          }
+        })
+      }
+    },
+    onSuccess () {
+      this.list = []
+      this.$emit('onSuccess')
     }
   },
   mounted () {

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -462,6 +462,7 @@ export default {
         }
       }
       let that = this
+      val.amount = val.qty * val.price
       this.$set(this.tableData,index,val)
       // // 防抖
       if(this.time !== null){

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -2,14 +2,22 @@
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
     <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
-      <div class="flex-align-center flex-between mt-10">
+      <div class="flex-align-center" style="margin-bottom:16px">
         <el-input 
-          style="width:200px" 
+          style="width:200px;margin-right: 10px;" 
           size="small"  
           suffix-icon="el-icon-search" 
           v-model="param.content.where.condition" 
           placeholder="订单号、产品编号、产品名称" 
           @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+        <uploadAllData
+          class="inline-16"
+          :total="total"
+          dataType="订单"
+          @handlePullApi="handlePullApi"
+          @handleUploadApi="handleUploadApi"
+          @onSuccess="onSuccess"
+        ></uploadAllData>
       </div>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
@@ -58,7 +66,9 @@
 </template>
 
 <script>
+import uploadAllData from '@/components/uploadAllData/index'
 export default {
+  components:{uploadAllData},
   props:['sys_enterpriseid','status'],
   data () {
     return {
@@ -128,6 +138,32 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
       })
+    },
+    /*拉取数据*/
+    handlePullApi (pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.param.content))
+      pullApi.id = this.param.id
+    },
+    /*上传数据*/
+    handleUploadApi (uploadApi,data) {
+      uploadApi.id = 20221217091203
+      uploadApi.content = {
+        "sa_invoiceapplyid": this.$route.query.id, 
+        "iteminfos": data.map(item => {
+          return {
+            "sa_invoiceapply_orderid": 0, 
+            "saorderid": item.sa_orderid, 
+            "sa_orderitemsid": item.sa_orderitemsid, 
+            "price": item.price, 
+            "invoiceamount": 0, 
+            "invoiceaqty": 0
+          }
+        })
+      }
+    },
+    onSuccess () {
+      this.list = []
+      this.$emit('onSuccess')
     }
   },
   mounted () {

src/components/dynamic-table/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="data.length <= 4?'260px':data.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;min-height:260px;max-height: calc(100vh - 420px)" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="height ? height : data.length <= 4?'260px':data.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;min-height:260px;max-height: calc(100vh - 420px)" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
       <el-table-column
           type="selection"

src/views/mediaStock/modules/fileInfo.vue

@@ -21,7 +21,7 @@
       <p v-else class="info-text">大小:0</p>
       <p class="info-text">上传人: {{file.createby}}</p>
       <p class="info-text normal-margin">上传时间: {{file.createdate}}</p>
-      <tableLayout :layout="tablecols" :data="list" :custom="true">
+      <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 550px)">
         <template v-slot:customcol="scope">
         <p v-if="scope.column.columnname === 'appdata'">
           <span>{{scope.column.data.data.appdata}}</span>