修改amend汇率类型 修改仓库多余的字段

src/views/iosBasicData/aeamends/assembly/amendsCostdetails.vue

@@ -72,16 +72,17 @@
             <template slot="unitNo" slot-scope="{ row }">
                 <search-query v-if="row.editType" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择计量单位"
-                    :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                    @corpChange="corpChange($event, 'unitNo', row)">
+                    :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                    @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row)">
                 </search-query>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
             <template slot="curCode" slot-scope="{ row }">
                 <search-query v-if="row.editType" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择币种"
-                    :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun(row.dc)"
-                    @corpChange="corpChange($event, 'curCode', row)" @corpFocus="bcurrencyGetExratefun(row.dc)">
+                    :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                    @remoteMethod="bcurrencyGetExratefun(row.dc)" @corpChange="corpChange($event, 'curCode', row)"
+                    @corpFocus="bcurrencyGetExratefun(row.dc)">
                 </search-query>
                 <span v-else>{{ row.curCode }}</span>
             </template>
@@ -771,7 +772,8 @@ export default {
         bcurrencyGetExratefun(dc) {
             bcurrencyGetExrate({
                 date: this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
-                dc: dc
+                dc: dc,
+                type: 1
             }).then(res => {
                 this.curCodeData = res.data.data
             })

src/views/iosBasicData/aiamends/assembly/amendsCostdetails.vue

@@ -72,16 +72,17 @@
             <template slot="unitNo" slot-scope="{ row }">
                 <search-query v-if="row.editType" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择计量单位"
-                    :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                    @corpChange="corpChange($event, 'unitNo', row)">
+                    :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                    @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row)">
                 </search-query>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
             <template slot="curCode" slot-scope="{ row }">
                 <search-query v-if="row.editType" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                     :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择币种"
-                    :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun(row.dc)"
-                    @corpChange="corpChange($event, 'curCode', row)" @corpFocus="bcurrencyGetExratefun(row.dc)">
+                    :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                    @remoteMethod="bcurrencyGetExratefun(row.dc)" @corpChange="corpChange($event, 'curCode', row)"
+                    @corpFocus="bcurrencyGetExratefun(row.dc)">
                 </search-query>
                 <span v-else>{{ row.curCode }}</span>
             </template>
@@ -771,7 +772,8 @@ export default {
         bcurrencyGetExratefun(dc) {
             bcurrencyGetExrate({
                 date: this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
-                dc: dc
+                dc: dc,
+                type: 1
             }).then(res => {
                 this.curCodeData = res.data.data
             })

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -529,7 +529,8 @@ export default {
                         // 汇率
                         bcurrencyGetExrate({
                             date: this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
-                            dc: row.dc
+                            dc: row.dc,
+                            type: 1
                         }).then(res => {
                             for (let item of res.data.data) {
                                 if (item.code == row.curCode) {
@@ -831,7 +832,7 @@ export default {
             bcurrencyGetExrate({
                 date: this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
                 dc: dc,
-                type:1
+                type: 1
             }).then(res => {
                 this.curCodeData = res.data.data
             })

src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -228,7 +228,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 24,
+        searchMenuSpan: 12,
         searchIcon: true,
         searchIndex: 3,
         highlightCurrentRow: true,
@@ -253,10 +253,6 @@ export default {
           overHidden: true,
         },
         {
-          label: '所属公司',
-          prop: "salesCompanyName",
-          overHidden: true,
-        }, {
           label: '货主',
           prop: "customerName",
           type: 'select',
@@ -264,8 +260,8 @@ export default {
           overHidden: true,
           cell: true,
           width: 140,
-          filterable:true,
-          remote:true,
+          filterable: true,
+          remote: true,
           props: {
             label: 'cname',
             value: 'cname',
@@ -274,13 +270,6 @@ export default {
           dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         },
         {
-          label: '显示已完成',
-          prop: 'notComplete',
-          overHidden: true,
-          hide: true,
-          search: true,
-          searchslot: true
-        }, {
           label: '仓库',
           prop: "storageName",
           search: true,
@@ -296,21 +285,12 @@ export default {
           label: '行数',
           prop: "numberRows",
           overHidden: true,
-        }, {
-          label: '商品名称',
-          prop: "goodsNameJoin",
-          search: false,
-          overHidden: true,
-        }, {
+        },
+        {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
         },
-        // {
-        //   label: '金额',
-        //   prop: "totalMoney",
-        //   overHidden: true,
-        // },
         {
           label: '已付金额',
           prop: "paymentAmountTl",
@@ -357,11 +337,6 @@ export default {
         //   overHidden: true,
         // },
         {
-          label: '退货状态',
-          prop: "returnsStatus",
-          overHidden: true,
-        },
-        {
           label: '备注',
           prop: "remarks",
           overHidden: true,

src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -223,38 +223,9 @@ export default {
           prop: "ordNo",
           search: true,
           overHidden: true,
-        }, {
-          label: '来源单号',
-          prop: "srcOrdNo",
-          search: true,
-          overHidden: true,
-        },
-        {
-          label: '显示已完成',
-          prop: 'notComplete',
-          overHidden: true,
-          hide: true,
-          search: true,
-          searchslot: true
-        },
+        }, 
         {
-          label: "业务来源",
-          prop: "businessSource",
-          overHidden: true,
-          search: true,
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          }
-        }, {
-          label: '所属公司',
-          prop: "salesCompanyName",
-          overHidden: true,
-        },
-        {
-          label: '业务对象',
+          label: '货主',
           prop: "customerName",
           search: true,
           remote: true,
@@ -303,21 +274,8 @@ export default {
           label: '行数',
           prop: "numberRows",
           overHidden: true,
-        }, {
-          label: '商品名称',
-          prop: "goodsNameJoin",
-          search: true,
-          overHidden: true,
-          // filterable: true,
-          // remote:true,
-          // type: 'select',
-          // props: {
-          //   label: 'cname',
-          //   value: 'cname',
-          //   res: 'data.records'
-          // },
-          // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
-        }, {
+        }
+        , {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
@@ -325,23 +283,8 @@ export default {
           label: '金额',
           prop: "totalMoney",
           overHidden: true,
-        }, {
-          label: '已收金额',
-          prop: "paymentAmountTl",
-          overHidden: true,
-        }, {
-          label: '余额抵扣',
-          prop: "paymentRecoveredBalance",
-          overHidden: true,
-        }, {
-          label: '退货数量',
-          prop: "returnsNumber",
-          overHidden: true,
-        }, {
-          label: '退货金额',
-          prop: "returnsAmount",
-          overHidden: true,
-        }, {
+        },
+        {
           label: '状态',
           prop: "status",
           search: true,
@@ -386,11 +329,6 @@ export default {
 
         },
         {
-          label: '退货状态',
-          prop: "returnsStatus",
-          overHidden: true,
-        },
-        {
           label: '备注',
           prop: "remarks",
           overHidden: true,