2023-2-23

src/HDrpManagement/toolBill/components/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
-    <el-drawer title="新建返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
+    <el-drawer title="编辑返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
@@ -43,6 +43,11 @@
                 <el-input type="textarea" size="small" v-model="form.reason"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="物流单号:" prop="logisticno">
+                <el-input type="textarea" size="small" v-model="form.logisticno"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="是否实物退回" prop="isitemreturn">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isitemreturn"></el-checkbox>
@@ -125,7 +130,18 @@ export default {
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
+          if (this.form.logisticno) {
+            let res2 = await this.$api.requested({
+              "id": "20230105100203",
+              "content": {
+                  "sa_aftersalesmagid":this.$route.query.id,
+                  "logisticno":this.form.logisticno,
+                  "returnamount":'',
+                  "payamount":''
+              }
+            })
+          }
           this.$emit('onSuccess')
           this.dialogFormVisible = false
         })

src/HDrpManagement/toolBill/components/selectOrder.vue

@@ -20,14 +20,9 @@
             label="订单类型">
           </el-table-column>
           <el-table-column
-            prop="tradefield"
-            label="领域">
+            prop="checkdate"
+            label="审核时间">
           </el-table-column>
-          <el-table-column
-            prop="rebate_userate"
-            label="订单使用返利占比">
-          </el-table-column>
-          
           <el-table-column
             label="操作"
             width="90">

src/HDrpManagement/toolBillMag/components/selectOrder.vue

@@ -63,7 +63,7 @@ export default {
         "id": 20230105110003,
         "version":1,
         "content": {
-            "sys_enterpriseid":'',
+          istool:1,
           "where":{
               "condition":""
           }

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,7 +1,7 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+    <!-- <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button> -->
     <el-table
       ref="multipleTable"
       :data="tableData"

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
       ref="details"
       :titleText="`单号:${mainData.sonum}`"
-      :oldFormPath="{edit:'SDrpManagement/toolBorrowing/modules'}"
       :editData="mainData"
       :mainAreaData="mainAreaData"
       turnPageId="20230114105002"
@@ -15,8 +14,9 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" class="inline-16">
-          <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" type="primary" size="mini" @click="confirmdate">确认交期</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData()"/>
+        <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" type="primary" size="mini" @click="confirmdate">确认交期</el-button>
+        <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
       </div>
       <div slot="slot0" >
         <toolList></toolList>
@@ -30,6 +30,7 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import Edit from '../modules/edit'
 
 export default {
   name: "detail",
@@ -42,6 +43,7 @@ export default {
     }
   },
   components:{
+    Edit,
     toolList,
     confirmDate
   },
@@ -59,6 +61,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
       this.orderreviewtype()
     },
@@ -140,11 +144,6 @@ export default {
       this.$router.replace({path:'/toolBorrowingDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     },
-    onSuccess(){
-      this.visible = false
-      this.queryMainData(this.$route.query.id)
-      this.$emit('onSuccess')
-    },
     // 提交订单
     onSubmit (type) {
       this.$confirm(`是否${type}该订单`, '提示', {

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -273,7 +273,7 @@ export default {
     },
     async updateOrder (val) {
       const res  = await this.$api.requested({
-        "id": 20221109093602,
+        "id": 20230116101602,
         "content": val
       })
       this.$emit('onSuccess')

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -384,7 +384,7 @@ export default {
         console.log(this.data)
         this.$emit('onSuccess')
         // this.onConfirm()
-        this.drawer = false
+        // this.drawer = false
       })
     },
     onDelSuccess () {
@@ -397,7 +397,7 @@ export default {
     // 订单添加商品
     async onConfirm (data) {
       const res = await this.$api.requested({
-        "id": 20221109093602,
+        "id": 20230116101602,
         "content": {
           "sa_orderid": this.$route.query.id, //订单ID
           "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID