songyang 1 жил өмнө
parent
commit
c02f1d2ddc

+ 1 - 0
src/locale/lang/zh-CN.js

@@ -634,6 +634,7 @@ export const columns = {
   amtinflow:'发生额',
   ordOutReturn:'退货单',
   ordRecPay:'收款单',
+  priceOther:'其他价格',
 }
 
 /**

+ 5 - 0
src/view/mst/goods/form.vue

@@ -90,6 +90,10 @@
           <DkFormItem prop="priceLimited">
             <InputNumberPop ref="priceLimited" v-model="formData.priceLimited"/>
           </DkFormItem>
+          <!--其他售价-->
+          <DkFormItem prop="priceOther">
+            <InputNumberPop ref="priceOther" v-model="formData.priceOther"/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <DkPanel prop="invInto" v-show="false">
@@ -161,6 +165,7 @@ export default {
         priceStandard : null, //零售价
         priceWholesale : null,//批发价
         priceLimited : null, //销售售价
+        priceOther : null, //其他价
         remarks: null,
       },
     }

+ 5 - 4
src/view/mst/goods/index.vue

@@ -49,10 +49,11 @@
           <DkTableColumn field="seriesName"></DkTableColumn>
           <DkTableColumn field="brandName"></DkTableColumn>
           <DkTableColumn field="shortName"></DkTableColumn>
-          <DkTableColumn field="pricePurchase"></DkTableColumn>
-          <DkTableColumn field="priceStandard"></DkTableColumn>
-          <DkTableColumn field="priceWholesale"></DkTableColumn>
-          <DkTableColumn field="priceLimited"></DkTableColumn>
+          <DkTableColumn field="pricePurchase" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceStandard" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceWholesale" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceLimited" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceOther" dataType="number"></DkTableColumn>
           <DkTableColumn field="remarks"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
         </DkTable>

+ 2 - 2
src/view/sale/order-track-report/index.vue

@@ -1,4 +1,4 @@
-<!-- @desc:采购跟踪  @auth:常皓宁  @time:2024/04/22 09:15 -->
+<!-- @desc:销售跟踪  @auth:宋扬  @time:2024/04/22 09:15 -->
 <template>
   <div slot="top" style="margin-left: 5px;">
     <DkTabs v-model="tabsModel" :options="tabsOptions" @on-click="tabsClick"></DkTabs>
@@ -220,7 +220,7 @@
             <InputPop ref="staffName" v-model="ordOutReturnData.staffName" :readonly="true"/>
           </DkFormItem>
           <!--出库日期-->
-          <DkFormItem prop="outDate" :data-type="$config.dataType.date" :label="$t('outRetDate')">
+          <DkFormItem prop="outDate" :data-type="$config.dataType.date">
             <DatePickerPop v-model="ordOutReturnData.outDate" :readonly="true" />
           </DkFormItem>
           <!--总出库中数量-->