lichao 3 سال پیش
والد
کامیت
02bb33bf36

+ 1 - 1
src/api/basicData/customerInquiry.js

@@ -174,4 +174,4 @@ export function getCode(query) {
     method: 'get',
     params:query
   })
-}
+}

+ 2 - 2
src/api/maintenance/salesPolicy.js

@@ -46,7 +46,7 @@ export function corpsattn(data) {
 //明细分页
 export function getItemdetail(query) {
     return request({
-        url: '/api/blade-mocha-item/salespolicyitem/page',
+        url: '/api/blade-mocha-item/salespolicyitem/list',
         method: 'get',
         params:query
     })
@@ -58,4 +58,4 @@ export function itemSubmit(data) {
         method: 'post',
         data: data
     })
-}
+}

+ 12 - 0
src/api/system/user.js

@@ -12,6 +12,18 @@ export const getList = (current, size, params, deptId) => {
     }
   })
 }
+export const userList = (current, size, params, deptId) => {
+  return request({
+    url: '/api/blade-user/userList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+      deptId,
+    }
+  })
+}
 
 export const remove = (ids) => {
   return request({

+ 3 - 3
src/components/messageSend/main.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { getList } from "@/api/system/user";
+import { userList } from "@/api/system/user";
 import { sendMessage,sendManyMessage } from "@/api/basicData/message"
 
 export default {
@@ -63,8 +63,8 @@ export default {
     }
   },
   created() {
-    getList().then(res => {
-      this.userOption = res.data.data.records;
+    userList().then(res => {
+      this.userOption = res.data.data;
     })
   },
   methods: {

+ 2 - 0
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -322,6 +322,7 @@
               <span v-else>{{ row.price }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
+              <span>{{row.inputMold }}</span>
               <span>{{ row.amount | decimalFormat }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
@@ -2603,6 +2604,7 @@ export default {
             this.$set(list[item], 'price', list[item].specialOffer)
           }
           this.$set(list[item], 'inputMold', 1)
+          this.$set(list[item], 'goodType', 0)
         } else {
           if (!list[item].salePrice) {
             getMarketPrice({code: list[item].code, isFreight: this.form.isFreight, isLabel: this.form.isLabel}).then(response => {