2023-2-22 19:00

src/HDrpManagement/ProductGroupMag/components/shelves.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="onshow">{{data.isonsale === 0?'上 架':'下 架'}}</el-button>
+    <el-button size="mini" type="primary" @click="onshow">{{data.isonsale === 0?'上 架':'下 架'}}</el-button>
     <el-dialog
         title="提示"
         :visible.sync="upVisible"

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -35,7 +35,7 @@
 
             </el-col>
             <el-col :span="24 - col">
-              <Table :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
+              <Table type="add" :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
             </el-col>
             <el-col :span="col">
               <selectTable @addProduct="addProduct"></selectTable>
@@ -64,6 +64,7 @@ export default {
       drawer:false,
       col:0,
       tableData:[],
+      index:0,
       form: {
         sa_brandid: '',
         groupname: '',
@@ -102,6 +103,8 @@ export default {
       this.tableData = []
     },
     addProduct (row) {
+      this.index ++
+      row.sequence = this.index
       this.tableData.push(row)
       const res = new Map();
       this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
@@ -121,20 +124,25 @@ export default {
           message:'商品组明细不能为空',
           type:'error'
         })
-      const res = await this.$api.requested({
-        "id": "20220922164303",
-        "content": this.form
-      })
-      this.tool.showMessage(res,()=>{
-        this.groupdata = res.data
-        this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+      this.$refs.form.validate(async val => {
+        if (val) {
+          const res = await this.$api.requested({
+          "id": "20220922164303",
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.groupdata = res.data
+          this.index = 0
+          this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+        })
+        }
       })
+      
     },
     productChange (data) {
       this.form.itemno = data.itemno
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
-      
     },
     async onSuccess () {
       const res = await this.$api.requested({

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -15,7 +15,7 @@
         </div>
       </template>
     </tableLayout> -->
-    <Table :data="list" @deleteProduct="deleteProduct"></Table>
+    <Table type="edit" :data="list" @deleteProduct="deleteProduct"></Table>
     <el-pagination
       background
       small

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -80,7 +80,7 @@ export default {
           value:this.mainData.isonsale ? '上架' : '下架'
         },
         {
-          label:'产品名',
+          label:'默认展示产品',
           value:this.mainData.itemname
         },
         /*{

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body @close="onCancel">
+    <el-drawer title="编辑商品组" :visible.sync="drawer" size="30%" direction="rtl" append-to-body>
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="品牌:" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%" :disabled="true">
+                <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"
                              :value="item.sa_brandid" size="small">
                   </el-option>
@@ -20,15 +20,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="序号:" prop="sequence">
-                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              <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>
+                </selectProduct>
               </el-form-item>
             </el-col>
           </el-form>
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="drawer=false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -36,8 +38,10 @@
 </template>
 
 <script>
+import selectProduct from '@/template/selectProduct/index.vue'
 export default {
   props: ['data', 'type'],
+  components:{selectProduct},
   data () {
     return {
       drawer:false,
@@ -72,26 +76,6 @@ export default {
       this.drawer=true
       this.form = Object.assign({},this.form,this.data)
     },
-    onCancel(){
-      this.drawer = false
-      this.form={
-        sa_brandid: '',
-        groupname: '',
-        itemno: '',
-        tag: []
-      },
-      this.tableData = []
-    },
-    addProduct (row) {
-      this.tableData.push(row)
-      const res = new Map();
-      this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
-    },
-    deleteProduct (row) {
-      this.tableData = this.tableData.filter(e=>{
-        return e.itemid !== row.itemid
-      })
-    },
     async submit() {
       const res = await this.$api.requested({
         "id": "20220922164303",
@@ -102,6 +86,11 @@ export default {
         this.drawer = false
       })
     },
+    productChange (data) {
+      this.form.itemno = data.itemno
+      this.form.itemname = data.itemname
+      this.$refs.product.visible = false
+    },
     /* 可选择的品牌列表 */
     async getBrandList() {
       let res = await this.$api.requested({
@@ -114,6 +103,17 @@ export default {
           }
         }
       })
+
+      let res2 = await this.$api.requested({
+        "id": "20220923101603",
+        "version":1,
+        "content": {
+          "sa_itemgroupid":this.$route.query.id,
+          "pageNumber":1,
+          "pageSize":20
+        }
+      },)
+      this.tableData = res2.data
       this.brandList = res.data
       console.log(this.brandList,'品牌');
     },

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -21,6 +21,14 @@
           label="产品编号"
           width="180">
       </el-table-column>
+      <el-table-column
+          prop="sequence"
+          label="排序"
+          width="100" v-if="type == 'add'">
+        <template slot-scope="scope">
+            <el-input type="text" size="mini" @input="onInput()" v-model="scope.row.sequence"></el-input>
+        </template>
+      </el-table-column>
       <el-table-column
           prop="itemname"
           label="产品名称"
@@ -105,7 +113,7 @@ export default {
   components:{
     previewImage
   },
-  props:['data'],
+  props:['data','type'],
   data () {
     return {
     }
@@ -128,6 +136,9 @@ export default {
       res.code === 1?this.$emit('onSuccess'):this.tool.showMessage(res)
       
     },
+    onInput () {
+      this.$forceUpdate()
+    },
     deleteProduct (row) {
       this.$emit('deleteProduct',row)
     }

src/HDrpManagement/ProductMag/detail/index.vue

@@ -68,11 +68,7 @@
       <div slot="slot1">
         <saleClass ref="saleClass" :data="mainData">
           <template v-slot:addClass="scope">
-<<<<<<< HEAD
             <addClass v-if="tool.checkAuth($route.name,'salerClass') && mainData.status === '新建'" :data="scope.data" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
-=======
-            <addClass v-if="tool.checkAuth($route.name,'salerClass')" :data="mainData" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
->>>>>>> xiaoqin
           </template>
         </saleClass>
       </div>

src/HDrpManagement/orderManage/details/index.vue

@@ -113,6 +113,11 @@ export default {
       selection:[]
     }
   },
+  provide () {
+    return {
+      thisDetail:() => this
+    }
+  },
   components:{
     defaultInfo,
     productList,
@@ -133,16 +138,20 @@ export default {
       this.value = res.data[0].value
     },
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        
+        this.changeDataStructure()
+        this.orderreviewtype()
+        re()
       })
-      this.mainData = res.data
       
-      this.changeDataStructure()
-      this.orderreviewtype()
     },
     changeDataStructure() {
       this.mainAreaData = [

src/HDrpManagement/orderManage/index.vue

@@ -78,12 +78,10 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'ischange'">
-          {{scope.data.column.data.ischange}}
-          {{ scope.data.column.data.ischange ? '是' : '否' }}
+          {{ +scope.data.column.data.ischange ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">
-          {{scope.data.column.data.isreturn}}
-          {{ scope.data.column.data.isreturn ? '是' : '否' }}
+          {{ +scope.data.column.data.isreturn ? '是' : '否' }}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/HDrpManagement/orderManage/modules/edit.vue

@@ -64,6 +64,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -113,6 +114,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -216,7 +218,8 @@ import productList from '../details/tabs/productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
 import selectSaler from '@/template/selectSaler/index.vue'
-
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
@@ -224,8 +227,11 @@ export default {
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,
@@ -259,6 +265,10 @@ export default {
       billdate:''
     }
   },
+  mounted () {
+    console.log(this.data);
+    
+  },
   methods:{
     onShow () {
       this.initPage()

src/SDrpManagement/agentOrder/details/index.vue

@@ -76,6 +76,11 @@ export default {
       dialogVisible:false
     }
   },
+  provide() {
+    return {
+      thisDetail: () => this
+    }
+  },
   components:{
     Edit,
     defaultInfo,
@@ -89,16 +94,20 @@ export default {
   },
   methods:{
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        console.log(this.mainData);
+        
+        this.changeDataStructure()
+        re()
       })
-      this.mainData = res.data
-      console.log(this.mainData);
       
-      this.changeDataStructure()
     },
     changeDataStructure() {
       let that = this
@@ -288,5 +297,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -53,6 +53,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -104,6 +105,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -196,14 +198,19 @@ import previewImage from '@/components/previewImage/index.vue'
 import productList from './productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,
@@ -258,6 +265,8 @@ export default {
         "id": "20230220002602",
         "content": {
           "pageSize":100,
+          "pageNumber":1,
+          "sys_enterpriseid":this.data.sys_enterpriseid,
           "where": {
               "condition": ""
           }

src/SDrpManagement/salerOrder/details/index.vue

@@ -75,6 +75,11 @@ export default {
       dialogVisible:false
     }
   },
+  provide () {
+    return {
+      thisDetail:() => this
+    }
+  },
   components:{
     defaultInfo,
     productList,
@@ -87,15 +92,18 @@ export default {
   },
   methods:{
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        this.changeDataStructure()
+        re()
       })
-      this.mainData = res.data
-      this.changeDataStructure()
-      console.log(this.mainData);
+      
       
     },
     changeDataStructure() {

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -53,6 +53,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -104,6 +105,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -196,14 +198,19 @@ import previewImage from '@/components/previewImage/index.vue'
 import productList from './productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,