暂存

src/HDrpManagement/ProductMag/index.vue

@@ -56,7 +56,7 @@
           </el-switch>
         </p>
         <p v-else-if="scope.data.column.columnname === 'cover'">
-          <previewImage v-if="scope.data.column.data.attinfos[0]"  style="width:80px;height:80px;margin-top:0px" class="image" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>
+          <previewImage v-if="scope.data.column.data.attinfos[0]" class="image" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>
         </p>
         <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</p>
         </div>
@@ -151,4 +151,10 @@ export default {
 
 </script>
 <style>
+</style>
+<style scoped>
+.image{
+  height: 38px;
+  width: 38px;
+}
 </style>

src/HDrpManagement/ProductMag/modules/list.vue

@@ -206,6 +206,6 @@ export default {
   transform: translate3d(0,-2px,0); */
 }
 .image {
-  width:40px;height:40px;margin:0px auto;
+  width:40px !important;height:40px !important;margin:0px auto;
 }
 </style>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -103,7 +103,7 @@
         <p class="normal-title inline-16">选择账户</p>
       </div>
       <div class="flex-align-center-wrap flex-between normal-margin">
-        <div class="account__panel" :class="defaultData.account_index === index?'act':''" v-for="(item,index) in accountlist" :key="item.index" @click="defaultData.account_index = index">
+        <div class="account__panel" :class="defaultData.accountclass.sa_accountclassid === item.sa_accountclassid?'act':''" v-for="(item) in accountlist" :key="item.index" @click="defaultData.accountclass = item">
           <p><b>¥{{tool.formatAmount(item.balance,2)}}</b></p>
           <small>{{item.accountname}}</small>
         </div>
@@ -157,7 +157,7 @@
       </div>
       <div class="mt-10">
         <p class="normal-title">订单产品</p>
-        <product-list :type="'edit'"></product-list>
+        <product-list :type="'edit'" @onSuccess="onSuccess"></product-list>
       </div>
     </div>
     <div class="fixed__btn__panel">
@@ -191,6 +191,7 @@ export default {
         re_info:{},
         logist_info:{},
         fin_info:{},
+        accountclass:{},
         account_index:0
       },
       agnetInfo:{},
@@ -242,6 +243,7 @@ export default {
         }
       })
       this.accountlist = res.data
+      this.defaultData.accountclass = this.data.accountclass
     },
 
     // 物流企业
@@ -254,7 +256,7 @@ export default {
         }
       })
       this.logisticcomlist = res.data
-      this.defaultData.logist_info = res.data[0]
+      this.defaultData.logist_info = this.data.logiscomp
     },
     // 财务信息
     async queryFinancial () {
@@ -267,27 +269,35 @@ export default {
         }
       })
       this.financiallist = res.data
-      this.defaultData.fin_info = res.data[0]
+      this.defaultData.fin_info = this.data.finance
     },
-    qtyChange () {},
     async onSubmit() {
+      console.log(this.data)
       const res = await this.$api.requested({
-        "id": 20221128183202,
+        "id": 20221108111402,
         "content": {
+          "sa_orderid": this.$route.query.id,
+          "sys_enterpriseid": 1, //订货企业id
           "sa_accountclassid": this.accountlist[this.defaultData.account_index].sa_accountclassid, //营销账户类型ID
+          "sa_brandid": this.data.sa_brandid, //品牌ID
+          // "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+          // "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
-          "remarks": this.defaultData.remarks, //可选
-          "items": this.data.map(e=>{
-            e.sa_orderitemsid = 0
-            return e
-          })
+          "type": this.data.type, //订单类型
+          "typemx":this.data.typemx, //明细分类，可选
+          "remarks": this.data.remarks, //可选
+          // "saler_hrid":this.data.saler_hrid//销售人员hrid,业务员hrid
         },
       })
       this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
         this.drawer = false
       })
+    },
+    onSuccess () {
+      this.$emit('onSuccess')
     }
   },
   mounted () {

src/HDrpManagement/orderManage/modules/productlist.vue

@@ -33,7 +33,7 @@
         label="数量"
         width="150">
         <template slot-scope="scope">
-          <el-input-number v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange"></el-input-number>
+          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
@@ -105,7 +105,8 @@ export default {
         },
       },
       total:0,
-      currentPage:0
+      currentPage:0,
+      time: null
     }
   },
   methods:{
@@ -126,7 +127,45 @@ export default {
       this.params.content.pageNumber = val
       this.listData()
     },
-    deleteOrderProduct () {},
+    async deleteOrderProduct (scope) {
+      const res = await this.$api.requested({
+        "id": 20221109093702,
+        "content": {
+          "sa_orderid":this.$route.qeury.id,
+          "sa_orderitemsids": [scope.row.sa_orderitemsid]
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+        this.$emit('onSuccess')
+      })
+    },
+    async updateOrderProduct (val) {
+      const res  = await this.$api.requested({
+        "id": 20221110145302,
+        "content": val
+      })
+    },
+    qtyChange (val,index) {
+      let that = this
+      this.$set(this.tableData,index,val)
+      // console.log(val,this.tableData)
+      // // 防抖
+      if(this.time !== null){
+        clearTimeout(this.time);
+      }
+      this.time = setTimeout(() => {
+        that.updateOrderProduct({
+          "sa_orderitemsid":val.sa_orderitemsid,
+          "sa_orderid":this.$route.query.id,//订单ID
+          "itemid":val.itemid,//商品ID
+          "type":"数量",//调整类型，目前只支持数量
+          "oldvalue":val.qty,//原值
+          "newvalue":val.qty,//调整后值
+          "remarks":val.remarks
+        })
+      },500)
+    }
   },
   mounted () {
     this.listData()