Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -5,12 +5,12 @@
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="商品组名称:" prop="groupname">
                 <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="品牌:" prop="sa_brandid">
                 <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%">
                   <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
@@ -19,7 +19,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <el-form-item label="序号:" prop="sequence">
+                <el-input v-model="form.sequence" placeholder="请输入商品组序号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="默认商品:" prop="sequence">
                 <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
                   <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
@@ -70,6 +75,7 @@ export default {
         groupname: '',
         itemno: '',
         itemname:'',
+        sequence:'',
         tag: [],
         sequence:'',
         sa_itemgroupid:0,
@@ -83,7 +89,10 @@ export default {
         ],
         itemno: [
           { required: true, message: '请选择商品', trigger: 'blur' },
-        ]
+        ],
+        sequence: [
+          { required: true, message: '请输入序号', trigger: 'blur' },
+        ],
       }
     }
   },

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -6,7 +6,7 @@
           <el-row>
             <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
               <el-col :span="24">
-                <Table @addProduct="submit">
+                <Table ref="table" :id="$route.query.id" @addProduct="submit">
                 </Table>
               </el-col>
             </el-form>
@@ -58,6 +58,9 @@ export default {
       this.drawer = true
       this.form = Object.assign({},this.form,this.rowData)
       this.form.itemno = ''
+      this.$nextTick(() => {
+        this.$refs.table.listData()
+      })
     },
     submit (row) {
       this.$refs.form.validate(async val => {

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -19,7 +19,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
+              <el-form-item label="序号:" prop="sequence">
+                <el-input v-model="form.sequence" placeholder="请输入商品组序号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="默认商品:" prop="sequence">
                 <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
                   <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
@@ -64,7 +69,10 @@ export default {
         ],
         itemno: [
           { required: true, message: '请选择商品', trigger: 'blur' },
-        ]
+        ],
+        sequence: [
+          { required: true, message: '请输入序号', trigger: 'blur' },
+        ],
       }
     }
   },

src/HDrpManagement/aftersalesBill/components/add.vue

@@ -83,7 +83,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/aftersalesBill/components/edit.vue

@@ -85,7 +85,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/orderManage/details/index.vue

@@ -11,7 +11,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['基本信息','订单明细','订单进度','居间费明细','发货单','物流单','发票记录','收支明细']"
+        :tabs="['基本信息','订单明细','订单进度','居间费明细','发货单','物流单','发票记录','收支明细','核销记录','erp对接记录','变更记录']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -75,6 +75,15 @@
       <div slot="slot7">
         <revenue :data="mainData"></revenue>
       </div>
+      <div slot="slot8">
+        <writeOff :data="mainData"></writeOff>
+      </div>
+      <div slot="slot9">
+        <erpHistory :data="mainData"></erpHistory>
+      </div>
+      <div slot="slot10">
+        <changeHistory :data="mainData"></changeHistory>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -99,6 +108,9 @@ import invoiceTable from './tabs/invoiceTable.vue'
 import changeSaler from '@/template/selectSaler/index'
 import revenue from './tabs/revenueAndExp.vue'
 import changeOrderMx from './tabs/changeOrderMx.vue'
+import writeOff from './tabs/writeoff.vue'
+import erpHistory from './tabs/erpHistory.vue'
+import changeHistory from './tabs/changeHistory.vue'
 
 export default {
   name: "detail",
@@ -131,7 +143,10 @@ export default {
     invoiceTable,
     changeSaler,
     revenue,
-    changeOrderMx
+    changeOrderMx,
+    writeOff,
+    erpHistory,
+    changeHistory
   },
   methods:{
     async orderreviewtype () {

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

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="变更人"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="变更时间"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="billdate"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="型号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="原数量">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="变更后数量">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="变更备注">
+      </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="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20230225142004,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

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

@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="推送人"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="推送时间"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="billdate"
+        label="返回状态">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="erp单据号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="错误信息">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="类型">
+      </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="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20230225141904,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

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

@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="核销单号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="核销日期"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="billdate"
+        label="收入凭证号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="核销单总金额">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="订单行号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="本次核销金额">
+      </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="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": "20230225141804",
+        "content": {
+            "sa_orderid": 14,
+            "pageSize":20,
+            "pageNumber":1
+
+        }
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData,'核销记录');
+      
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/serveBill/components/changeBill.vue

@@ -98,8 +98,8 @@ export default {
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
-          if (route.path !== '/workorderDetail') {
-            this.oldRoute = {path:route.path,query:route.query}
+          if (this.$route.path !== '/workorderDetail') {
+            this.oldRoute = {path:this.$route.path,query:this.$route.query}
             this.$store.dispatch('setHistoryRouter',this.oldRoute)
           }
           this.$router.push({

src/HDrpManagement/writeoffbill/modules/order/index.vue

@@ -84,6 +84,10 @@ export default {
   },
   methods:{
     async save (data) {
+      if (typeof +data.writeoffamount != 'number') return this.$message({
+        title:'提示',
+        message:'请输入数字'
+      })
       let res = await this.$api.requested({
         "id":20221124090904,
         "content": {

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-      <add v-if="tool.checkAuth($route.name,'areaAuth')" @onSuccess="alreadyAuthField" class="mt-10" />
+      <add v-if="tool.checkAuth($route.name,'areaAuthAdd')" @onSuccess="alreadyAuthField" class="mt-10" />
       <el-table
         :data="alfield"
         style="width: 100%"
@@ -28,7 +28,7 @@
             <el-popconfirm
               title="确定删除吗？"
               @confirm="deleteField(scope.row)">
-              <el-button v-if="tool.checkAuth($route.name,'areaAuth')" slot="reference" type="text" size="mini">删除</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'areaAuthDel')" slot="reference" type="text" size="mini">删除</el-button>
             </el-popconfirm>
           </template>
         </el-table-column>

src/HManagement/notice/list/modules/add_notice.vue

@@ -181,7 +181,7 @@ export default {
   },
   methods: {
     onUploadSuccess() {
-      this.form.status !== '新建' ? this.queryNoticeMain() : this.onSubmit()
+      this.queryNoticeMain()
     },
     async emitNotice () {
       const res2 = await this.$api.requested({

src/template/product/index.vue

@@ -117,11 +117,13 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
+  props:['id'],
   data () {
     return {
       params:{
         "id": 20220923112503,
         "content": {
+          "nocache":true,
           "pageNumber": 1,
           "pageSize": 20,
             "sa_itemgroupid":0,
@@ -142,6 +144,7 @@ export default {
   },
   methods:{
     async listData () {
+      this.params.content.sa_itemgroupid = this.id ? this.id : 0
       const res = await this.$api.requested(this.params)
       this.tableData = res.data
       this.total = res.total