暂存

src/HDrpManagement/orderManage/details/index.vue

@@ -31,7 +31,7 @@
         <product-list ref="prod"></product-list>
       </div>
       <div slot="slot2" >
-        <!-- <product-list ref="prod"></product-list> -->
+        <orderprogress></orderprogress>
       </div>
       <div slot="slot3" >
         <rebat></rebat>
@@ -52,6 +52,7 @@ import defaultInfo from './tabs/defaultInfo.vue';
 import productList from './tabs/productlist.vue'
 import confirmDate from '../modules/confirmDate.vue'
 import rebat from './tabs/rebatesettlement.vue'
+import orderprogress from './tabs/orderpProgress.vue'
 export default {
   name: "detail",
   data() {
@@ -66,7 +67,8 @@ export default {
     defaultInfo,
     productList,
     confirmDate,
-    rebat
+    rebat,
+    orderprogress
   },
   methods:{
     async queryMainData(id) {

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

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-timeline :reverse="false">
+      <el-timeline-item
+        v-for="(item, index) in list"
+        :key="index"
+        :color="index === 0?'#6090f8':''"
+        :timestamp="item.actiondate">
+        <span style="color:#6090f8">{{item.action}}</span>
+        {{item.remarks}}
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      list:[]
+    }
+  },
+  methods:{
+    async progressList () {
+      const res = await this.$api.requested({
+        "id": 20221229093602,
+        "content": {
+            "sa_orderid": this.$route.query.id,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+        },
+      })
+      this.list = res.data
+    }
+  },
+  mounted () {
+    this.progressList()
+  }
+}
+
+</script>
+<style>
+</style>

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

@@ -111,9 +111,10 @@
       <el-table-column
         prop="price"
         label="价格"
-        width="90">
+        width="100">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+           <el-input v-if="type === 'edit' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="if(scope.row.price > scope.row.oldprice) scope.row.price  = scope.row.oldprice; if(scope.row.price  < 0) scope.row.price  = 0;" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+          <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -122,6 +123,14 @@
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
+      <el-table-column
+        label="备注"
+        width="300">
+        <template slot-scope="scope">
+          <el-input v-if="type === 'edit'" v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+          <p v-else>{{scope.row.remarks}}</p>
+        </template>
+      </el-table-column>
       <el-table-column v-if="type === 'edit'" width="90" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
@@ -203,12 +212,6 @@ export default {
         this.$emit('onSuccess')
       })
     },
-    // async updateOrderProduct (val) {
-    //   const res  = await this.$api.requested({
-    //     "id": 20221110145302,
-    //     "content": val
-    //   })
-    // },
     rowChange (val,index) {
       let that = this
       this.$set(this.tableData,index,val)
@@ -226,14 +229,15 @@ export default {
             "sa_orderitemsid": val.sa_orderitemsid,//0表示新增
             "itemid": val.itemid, //商品ID
             "qty": val.qty, //数量
-            "needdate": val.needdate//可以不传,修改交期
+            "needdate": val.needdate,//可以不传,修改交期
+            "price":val.price,
+            "remarks":val.remarks
           }]
         })
       },500)
     },
     onDateChange (val){
       let that = this
-      
       that.updateOrder({
         "sa_orderid": this.data.sa_orderid, //订单ID
         "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID

src/SDrpManagement/agentOrder/details/index.vue

@@ -26,7 +26,7 @@
         <product-list ref="prod"></product-list>
       </div>
       <div slot="slot2" >
-        <product-list ref="prod"></product-list>
+        <orderprogress ref="prod"></orderprogress>
       </div>
       <div slot="slot3" >
         <rebat></rebat>
@@ -44,9 +44,9 @@
 
 <script>
 import defaultInfo from './tabs/defaultInfo.vue';
-import productList from '../modules/productlist'
+import productList from '../modules/productlist.vue'
 import rebat from './tabs/rebatesettlement.vue'
-
+import orderprogress from './tabs/orderpProgress.vue'
 export default {
   name: "detail",
   data() {
@@ -60,7 +60,8 @@ export default {
   components:{
     defaultInfo,
     productList,
-    rebat
+    rebat,
+    orderprogress
   },
   methods:{
     async queryMainData(id) {

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

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-timeline :reverse="false">
+      <el-timeline-item
+        v-for="(item, index) in list"
+        :key="index"
+        :color="index === 0?'#6090f8':''"
+        :timestamp="item.actiondate">
+        <span style="color:#6090f8">{{item.action}}</span>
+        {{item.remarks}}
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      list:[]
+    }
+  },
+  methods:{
+    async progressList () {
+      const res = await this.$api.requested({
+        "id": 20221229093602,
+        "content": {
+            "sa_orderid": this.$route.query.id,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+        },
+      })
+      this.list = res.data
+    }
+  },
+  mounted () {
+    this.progressList()
+  }
+}
+
+</script>
+<style>
+</style>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -71,7 +71,6 @@ export default {
       visible:false,
       form:{
         "sa_orderid": 0,
-        "sys_enterpriseid": 0, //订货企业id，可不传，默认取当前账号的
         "sa_accountclassid": 0, //营销账户类型ID
         "sa_brandid": "", //品牌ID
         "sa_contractid": 0, //合同ID，标准订单不传

src/components/attachment_list/index.vue

@@ -39,7 +39,7 @@
         <template slot-scope="scope">
           <div v-if="actid === scope.row.attachmentid">
             <el-button type="text" size="small" @click="saveEdit(scope.row)">保 存</el-button>
-            <el-button type="text" size="small" @click="actid = 0">取 消</el-button>
+            <el-button type="text" size="small" @click="refresh(actid = 0)">取 消</el-button>
           </div>
           <div v-else>
             <el-button type="text" size="small" @click="download(scope.row)">下 载</el-button>
@@ -61,10 +61,13 @@ export default {
   props:['attinfos','onlyread'],
   data () {
     return {
-      actid:null
+      actid:null,
     }
   },
   methods:{
+    refresh () {
+      this.$emit('cancelEdit')
+    },
     editAttachment (row) {
       this.actid = row.attachmentid
     },

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -12,7 +12,7 @@
       <slot v-if="'tab'+index === activeName"  :name="'slot' + index"></slot>
     </div>
     <div v-show="activeName === 'file'">
-      <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments">
+      <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
         <upload slot="upload" :folderid="folderid"
           :bindData="{ ownertable: ownertable, ownerid: editData[idname], usetype: 'default' }"
           @onSuccess="queryAttments"></upload>