yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
jg-waiwang-pro
胡川虎 5 months ago
parent 3eaab03351 164fcc8de1
commit a3fe85da63
23 changed files with 4612 additions and 254 deletions
Show Stats Download Patch File Download Diff File

36
jnpf-app/components/jnpf/jnpf-checkbox/index.vue
Unescape View File

@ -2,20 +2,36 @@
<view :class="'jnpf-checkbox jnpf-checkbox-right'">
<view v-if="direction === 'horizontal'">
<u-checkbox-group @change="onChange" :disabled="disabled" style="display: flow-root;">
<u-checkbox v-model="item.checked" label-size='26' v-for="(item, index) in newOptions" :key="index"
:name="item[props.value]">
{{ item[props.label] }}
</u-checkbox>
<template v-if="showOnly">
<u-checkbox v-if="item.checked" v-model="item.checked" label-size='26' v-for="(item, index) in newOptions" :key="index"
:name="item[props.value]">
{{ item[props.label] }}
</u-checkbox>
</template>
<template v-else>
<u-checkbox label-size='26' v-for="(item, index) in newOptions" :key="index"
:name="item[props.value]">
{{ item[props.label] }}
</u-checkbox>
</template>
</u-checkbox-group>
</view>
<!-- 竖 -->
<view class="u-select__body u-select__body__multiple" v-else>
<scroll-view :scroll-y="true" style="height: 100%">
<u-checkbox-group @change="onChange" wrap :disabled="disabled">
<u-checkbox v-model="item.checked" :name="item[props.value]" v-for="(item,i) in newOptions"
:key="i">
{{ item[props.label] }}
</u-checkbox>
<template v-if="showOnly">
<u-checkbox v-if="item.checked" v-model="item.checked" :name="item[props.value]" v-for="(item,i) in newOptions"
:key="i">
{{ item[props.label] }}
</u-checkbox>
</template>
<template v-else>
<u-checkbox v-model="item.checked" :name="item[props.value]" v-for="(item,i) in newOptions"
:key="i">
{{ item[props.label] }}
</u-checkbox>
</template>
</u-checkbox-group>
</scroll-view>
</view>
@ -52,6 +68,10 @@
disabled: {
type: Boolean,
default: false
},
showOnly: {
type: Boolean,
default: false
}
},
data() {

31
jnpf-app/components/jnpf/jnpf-radio/index.vue
Unescape View File

@ -2,17 +2,34 @@
<view :class="'jnpf-radio jnpf-radio-right'">
<view class="" v-if="direction === 'horizontal'">
<u-radio-group @change="onChange" :disabled="disabled" v-model="initValue" style="display:flow-root;">
<u-radio label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
<template v-if="showOnly">
<u-radio v-if="item[props.value] == initValue" label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
</template>
<template v-else>
<u-radio label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
</template>
</u-radio-group>
</view>
<!-- 竖 -->
<view class="radio-c" v-else>
<u-radio-group @change="onChange" :disabled="disabled" v-model="initValue">
<u-radio label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
<!-- <u-radio label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
</u-radio> -->
<template v-if="showOnly">
<u-radio v-if="item[props.value] == initValue" label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
</template>
<template v-else>
<u-radio label-size='26' v-for="(item, index) in options" :key="index" :name="item[props.value]">
{{ item[props.label] }}
</u-radio>
</template>
</u-radio-group>
</view>
</view>
@ -47,6 +64,10 @@
disabled: {
type: Boolean,
default: false
},
showOnly: {
type: Boolean,
default: false
}
},
data() {

12
jnpf-app/pages.json
Unescape View File

@ -496,6 +496,18 @@
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "cwpaymentreceipt/index",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "cwsettlement/index",
"style": {
"navigationBarTitleText": ""
}
}
]
},

17
jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue
Unescape View File

@ -293,20 +293,21 @@
</view>
<view class="jnpf-table" v-if="judgeShow('settlementinfoList')">
<view class="jnpf-table-item" v-for="(item,i) in dataForm.settlementinfoList" :key="i">
<view class="jnpf-table-item-title u-flex u-row-between">
<text class="jnpf-table-item-title-num">({{i+1}})</text>
<view class="jnpf-table-item-title-action"
v-if=" !judgeWrite('settlementinfoList') && dataForm.settlementinfoList.length>0"
@click="delsettlementinfoList(i)">删除</view>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('settlementinfoList-subjectBasicId')"
:required="requiredList['settlementinfoList-subjectBasicId']" label="客户名称">
:required="requiredList['settlementinfoList-subjectBasicId']" label="供应商名称">
<u-input v-model="dataForm.settlementinfoList[i].subjectBasicId"
:disabled="judgeWrite('settlementinfoList')||judgeWrite('settlementinfoList-subjectBasicId')"
@change="changeData('settlementinfo-subjectBasicId',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
<jnpf-popup-select v-model="dataForm.settlementinfoList[i].subjectBasicId" :disabled="true"
@change="changeData('receiveAddress',-1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.deliveryAddress" clearable propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='addressDetail' vModel='receiveAddress'
:columnOptions="deliveryAddressColumnOptions" interfaceId="522724961224231173" :pageSize="20"
placeholder="请选择" type="popup" :style='{"width":"100%"}'>
</jnpf-popup-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -1117,7 +1118,7 @@
expectArriveDateStart: [],
createOrderDate: [],
deliveryType: [],
contractId: [],
contractId: [{ "dataType": "varchar", "defaultValue": "", "field": "businessLineId", "fieldName": "", "id": "PneOdw1", "jnpfKey": "popupSelect", "relationField": "businessLineId", "required": "0" }],
currency: [],
saleMode: [],
correlatedOrderId: [],

323
jnpf-app/pages/scm/form/contractL/index.vue
Unescape View File

@ -4,10 +4,8 @@
label-align="right" :label-width="labelwidth" class="jnpf-form">
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="合同类型" content="合同类型">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>合同类型
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -17,16 +15,14 @@
:left-icon-style="{'color':'#a0acb7'}" prop="contractType">
<jnpf-radio v-model="dataForm.contractType" :disabled="judgeWrite('contractType')"
@change="changeData('contractType',-1)" optionType="button" direction="horizontal"
:props="contractTypeProps" :options="contractTypeOptions">
:props="contractTypeProps" :options="contractTypeOptions" :showOnly="true">
</jnpf-radio>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="基本信息" content="基本信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>基本信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -115,10 +111,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="主体信息" content="主体信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>主体信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -147,18 +141,14 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="财务信息" content="财务信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>财务信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="合同信息" content="合同信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>合同信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -170,6 +160,7 @@
</jnpf-select>
</u-form-item>
</view>
<template v-if="dataForm.procurementModel == 1">
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('relatedContractId')" :required="requiredList.relatedContractId"
label="关联销售合同" prop="relatedContractId">
@ -182,6 +173,7 @@
</jnpf-popup-select>
</u-form-item>
</view>
</template>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('subject2')&&fncGetSubject2Show" :required="requiredList.subject2"
:label="fncGetSubject2Label" prop="subject2">
@ -208,10 +200,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="交货和运输信息" content="交货和运输信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>交货和运输信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -252,10 +242,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value=" 合同条款信息" content=" 合同条款信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>合同条款信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -485,127 +473,127 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="商品明细" content="商品明细">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>商品明细
</u-form-item>
</view>
<view class="jnpf-table" v-if="judgeShow('contractLCommodityList')">
<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
<view class="jnpf-table-item-title u-flex u-row-between">
<text class="jnpf-table-item-title-num">商品明细({{i+1}})</text>
<view class="jnpf-table-item-title-action"
v-if=" !judgeWrite('contractLCommodityList') && dataForm.contractLCommodityList.length>0"
@click="delcontractlcommodityList(i)">删除</view>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-productId')"
:required="requiredList['contractlcommodityList-productId']" label="商品ID">
<jnpf-popup-select v-model="dataForm.contractLCommodityList[i].productId"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-productId')"
@change="changeData('contractlcommodity-productId',i)" :rowIndex="i"
:formData="dataForm" :templateJson="interfaceRes.contractlcommodityproductId" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='id' :vModel="'productId'+i"
:columnOptions="contractlcommodityproductIdColumnOptions"
interfaceId="530288111456878597" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'>
</jnpf-popup-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-commodityCode')"
:required="requiredList['contractlcommodityList-commodityCode']" label="商品编码">
<u-input v-model="dataForm.contractLCommodityList[i].commodityCode"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityCode')"
@change="changeData('contractlcommodity-commodityCode',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-commodityName')"
:required="requiredList['contractlcommodityList-commodityName']" label="商品名称">
<u-input v-model="dataForm.contractLCommodityList[i].commodityName"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityName')"
@change="changeData('contractlcommodity-commodityName',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-specifications')"
:required="requiredList['contractlcommodityList-specifications']" label="商品规格">
<u-input v-model="dataForm.contractLCommodityList[i].specifications"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-specifications')"
@change="changeData('contractlcommodity-specifications',i)" input-align='right'
clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-inventoryUnitId')"
:required="requiredList['contractlcommodityList-inventoryUnitId']" label="库存单位">
<u-input :value="getProductUnitName(dataForm.contractLCommodityList[i].inventoryUnitId)"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-inventoryUnitId')"
@change="changeData('contractlcommodity-inventoryUnitId',i)" input-align='right'
clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-procureUnit')"
:required="requiredList['contractlcommodityList-procureUnit']" label="采购单位">
<jnpf-select v-model="dataForm.contractLCommodityList[i].procureUnit"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-procureUnit')"
@change="changeData('contractlcommodity-procureUnit',i)" clearable placeholder="请选择"
:props="contractlcommodityprocureUnitProps"
:options="contractlcommodityprocureUnitOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-number')"
:required="requiredList['contractlcommodityList-number']" label="数量">
<u-input v-model="dataForm.contractLCommodityList[i].number"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-number')"
@change="changeData('contractlcommodity-number',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-taxRate')"
:required="requiredList['contractlcommodityList-taxRate']" label="税率">
<u-input v-model="dataForm.contractLCommodityList[i].taxRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-taxRate')"
@change="changeData('contractlcommodity-taxRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input><span style="padding: 0px 5px">%</span>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-priceRate')"
:required="requiredList['contractlcommodityList-priceRate']" label="含税单价">
<u-input v-model="dataForm.contractLCommodityList[i].priceRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-priceRate')"
@change="changeData('contractlcommodity-priceRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-totalRate')"
:required="requiredList['contractlcommodityList-totalRate']" label="含税总金额">
<u-input v-model="dataForm.contractLCommodityList[i].totalRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-totalRate')"
@change="changeData('contractlcommodity-totalRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
</view>
<u-collapse>
<u-collapse-item :title="dataForm.contractLCommodityList[i].commodityName+'(' + (i+1) + ') '" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
<!-- <view class="jnpf-table-item-title u-flex u-row-between">
<text class="jnpf-table-item-title-num">商品明细({{i+1}})</text>
<view class="jnpf-table-item-title-action"
v-if=" !judgeWrite('contractLCommodityList') && dataForm.contractLCommodityList.length>0"
@click="delcontractlcommodityList(i)">删除</view>
</view> -->
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-productId')"
:required="requiredList['contractlcommodityList-productId']" label="商品ID">
<jnpf-popup-select v-model="dataForm.contractLCommodityList[i].productId"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-productId')"
@change="changeData('contractlcommodity-productId',i)" :rowIndex="i"
:formData="dataForm" :templateJson="interfaceRes.contractlcommodityproductId" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='id' :vModel="'productId'+i"
:columnOptions="contractlcommodityproductIdColumnOptions"
interfaceId="530288111456878597" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'>
</jnpf-popup-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-commodityCode')"
:required="requiredList['contractlcommodityList-commodityCode']" label="商品编码">
<u-input v-model="dataForm.contractLCommodityList[i].commodityCode"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityCode')"
@change="changeData('contractlcommodity-commodityCode',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-commodityName')"
:required="requiredList['contractlcommodityList-commodityName']" label="商品名称">
<u-input v-model="dataForm.contractLCommodityList[i].commodityName"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityName')"
@change="changeData('contractlcommodity-commodityName',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-specifications')"
:required="requiredList['contractlcommodityList-specifications']" label="商品规格">
<u-input v-model="dataForm.contractLCommodityList[i].specifications"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-specifications')"
@change="changeData('contractlcommodity-specifications',i)" input-align='right'
clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-inventoryUnitId')"
:required="requiredList['contractlcommodityList-inventoryUnitId']" label="库存单位">
<u-input :value="getProductUnitName(dataForm.contractLCommodityList[i].inventoryUnitId)"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-inventoryUnitId')"
@change="changeData('contractlcommodity-inventoryUnitId',i)" input-align='right'
clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-procureUnit')"
:required="requiredList['contractlcommodityList-procureUnit']" label="采购单位">
<jnpf-select v-model="dataForm.contractLCommodityList[i].procureUnit"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-procureUnit')"
@change="changeData('contractlcommodity-procureUnit',i)" clearable placeholder="请选择"
:props="contractlcommodityprocureUnitProps"
:options="contractlcommodityprocureUnitOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-number')"
:required="requiredList['contractlcommodityList-number']" label="数量">
<u-input v-model="dataForm.contractLCommodityList[i].number"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-number')"
@change="changeData('contractlcommodity-number',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-taxRate')"
:required="requiredList['contractlcommodityList-taxRate']" label="税率">
<u-input v-model="dataForm.contractLCommodityList[i].taxRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-taxRate')"
@change="changeData('contractlcommodity-taxRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input><span style="padding: 0px 5px">%</span>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-priceRate')"
:required="requiredList['contractlcommodityList-priceRate']" label="含税单价">
<u-input v-model="dataForm.contractLCommodityList[i].priceRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-priceRate')"
@change="changeData('contractlcommodity-priceRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractlcommodityList-totalRate')"
:required="requiredList['contractlcommodityList-totalRate']" label="含税总金额">
<u-input v-model="dataForm.contractLCommodityList[i].totalRate"
:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-totalRate')"
@change="changeData('contractlcommodity-totalRate',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
</u-collapse-item>
</u-collapse>
<view class="jnpf-table-addBtn" @click="addcontractlcommodityList"
v-if="!judgeWrite('contractLCommodityList')">
<u-icon name="plus" color="#2979ff"></u-icon>
@ -614,10 +602,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="费用条款" content="费用条款">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>费用条款
</u-form-item>
</view>
<view class="jnpf-table" v-if="judgeShow('contractLFeeClauseList')">
@ -668,10 +654,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="付款节点" content="付款节点">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>付款节点
</u-form-item>
</view>
<view class="jnpf-table" v-if="judgeShow('contractLPaymentList')">
@ -743,7 +727,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('totalAmount')" :required="requiredList.totalAmount" label="合计金额（人民币）"
prop="totalAmount">
prop="totalAmount" label-position="top" label-align="left">
<jnpf-number-box v-model="dataForm.totalAmount" :disabled="judgeWrite('totalAmount')"
@change="changeData('totalAmount',-1)" :precision="2" addonAfter="元" :controls="false"
placeholder="数字文本" :step="1">
@ -752,7 +736,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('amountCapitalization')" :required="requiredList.amountCapitalization"
label="大写金额（人民币）" prop="amountCapitalization">
label="大写金额（人民币）" prop="amountCapitalization" label-position="top" label-align="left">
<u-input v-model="dataForm.amountCapitalization" :disabled="judgeWrite('amountCapitalization')"
@change="changeData('amountCapitalization',-1)" input-align='right' clearable placeholder="请输入"
:style='{"width":"100%"}'>
@ -761,10 +745,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="其他信息" content="其他信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>其他信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -777,8 +759,7 @@
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" label-width="0"
prop="remark">
<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" prop="remark">
<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
@change="changeData('remark',-1)" input-align='right' placeholder="请输入" type="textarea"
:style='{"width":"100%"}'>
@ -787,15 +768,13 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="附件信息" content="附件信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
</view>附件信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('contractAppendices')" :required="requiredList.contractAppendices"
label="合同附件" prop="contractAppendices">
label="合同附件" prop="contractAppendices" label-position="top" label-align="left">
<jnpf-file v-model="dataForm.contractAppendices" :disabled="judgeWrite('contractAppendices')"
@change="changeData('contractAppendices',-1)" :list="dataForm.contractAppendices"
tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@ -805,7 +784,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('ancillaryDocuments')" :required="requiredList.ancillaryDocuments"
label="附属文件" prop="ancillaryDocuments">
label="附属文件" prop="ancillaryDocuments" label-position="top" label-align="left">
<jnpf-file v-model="dataForm.ancillaryDocuments" :disabled="judgeWrite('ancillaryDocuments')"
@change="changeData('ancillaryDocuments',-1)" :list="dataForm.ancillaryDocuments"
tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@ -815,7 +794,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('transactionAppendices')" :required="requiredList.transactionAppendices"
label="关联交易合同（二级）" prop="transactionAppendices">
label="关联交易合同（二级）" prop="transactionAppendices" label-position="top" label-align="left">
<jnpf-file v-model="dataForm.transactionAppendices" :disabled="judgeWrite('transactionAppendices')"
@change="changeData('transactionAppendices',-1)" :list="dataForm.transactionAppendices"
tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@ -825,7 +804,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('transactionAppendices2')" :required="requiredList.transactionAppendices2"
label="关联交易合同（三级）" prop="transactionAppendices2">
label="关联交易合同（三级）" prop="transactionAppendices2" label-position="top" label-align="left">
<jnpf-file v-model="dataForm.transactionAppendices2"
:disabled="judgeWrite('transactionAppendices2')"
@change="changeData('transactionAppendices2',-1)" :list="dataForm.transactionAppendices2"
@ -1246,7 +1225,7 @@
"multiple": false,
"children": ""
},
labelwidth: 130 * 1.5,
labelwidth: 180 * 1.5,
menuId: '',
jurisdictionType: '',
ruleList: {

1075
jnpf-app/pages/scm/form/cwpaymentreceipt/index.vue
View File

File diff suppressed because it is too large Load Diff

2167
jnpf-app/pages/scm/form/cwsettlement/index.vue
View File

File diff suppressed because it is too large Load Diff

46
jnpf-app/pages/scm/form/productWarehouse/index.vue
Unescape View File

@ -4,10 +4,7 @@
label-align="right" :label-width="labelwidth" class="jnpf-form">
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="商品类型" content="商品类型">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>商品类型
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -15,16 +12,13 @@
prop="productTypeId">
<jnpf-radio v-model="dataForm.productTypeId" :disabled="judgeWrite('productTypeId')"
@change="changeData('productTypeId',-1)" optionType="default" direction="horizontal"
:props="productTypeIdProps" :options="productTypeIdOptions">
:props="productTypeIdProps" :options="productTypeIdOptions" :showOnly="true">
</jnpf-radio>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="基本信息" content="基本信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>基本信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -104,10 +98,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="商品特性" content="商品特性">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>商品特性
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -148,11 +139,14 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>供应链/财务信息
</u-form-item>
<!-- <u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="供应链/财务信息" content="供应链/财务信息">
</jnpf-text>
</u-form-item>
</u-form-item> -->
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('firstSupplierId')" :required="requiredList.firstSupplierId" label="首选供应商"
@ -195,10 +189,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="单位/价格信息" content="单位/价格信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>单位/价格信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -303,10 +294,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="销售信息" content="销售信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>销售信息
</u-form-item>
</view>
@ -333,10 +321,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="库存信息" content="库存信息">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>库存信息
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -397,10 +382,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item>
<jnpf-text
:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
value="适配业务范围" content="适配业务范围">
</jnpf-text>
<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;"></view>适配业务范围
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
@ -411,7 +393,7 @@
:disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')"
@change="changeData('jnpf_jg_product_business_jnpf_businessLineId',-1)" optionType="default"
direction="horizontal" :props="jnpf_jg_product_business_jnpf_businessLineIdProps"
:options="jnpf_jg_product_business_jnpf_businessLineIdOptions">
:options="jnpf_jg_product_business_jnpf_businessLineIdOptions" :showOnly="true">
</jnpf-checkbox>
</u-form-item>
</view>
@ -745,7 +727,7 @@
"multiple": false,
"children": ""
},
labelwidth: 120 * 1.5,
labelwidth: 130 * 1.5,
menuId: '',
jurisdictionType: '',
ruleList: {

539
jnpf-app/pages/scm/index/cwpaymentreceipt/index.vue
Unescape View File

@ -0,0 +1,539 @@
<template>
<view class="dynamicModel-list-v">
<view class="head-warp com-dropdown">
<u-dropdown class="u-dropdown" ref="uDropdown" @open="openData" >
<u-dropdown-item title="排序">
<view class="dropdown-slot-content">
<view class="dropdown-slot-content-main">
<u-cell-group>
<u-cell-item @click="cellClick(item)" :arrow="false" :title="item.label"
v-for="(item, index) in sortOptions" :key="index" :title-style="{color: sortValue == item.value ? '#2979ff' : '#606266' }">
<u-icon v-if="sortValue == item.value" name="checkbox-mark" color="#2979ff" size="32"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
</view>
</u-dropdown-item>
<u-dropdown-item title="筛选" >
<view class="dropdown-slot-content">
<view class="dropdown-slot-content-main search-main">
<scroll-view scroll-y="true" style="height: 1000rpx;">
<view class="u-p-l-20 u-p-r-20 search-form">
<u-form :model="searchForm" ref="searchForm" :errorType="['toast']" label-position="left" label-width="150">
</u-form>
</view>
</scroll-view>
<view class="buttom-actions">
<u-button class="buttom-btn" @click="reset">重置</u-button>
<u-button class="buttom-btn" type="primary" @click="closeDropdown">检索</u-button>
</view>
<view class="dropdown-slot-bg" @click="$refs.uDropdown.close()"></view>
</view>
</view>
</u-dropdown-item>
</u-dropdown>
</view>
<view class="list-warp">
<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption" top="100">
<view class="list">
<view class="list-box">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item v-for="(item, index) in list" :key="item.id" :threshold="0" :right-options="options">
<view class="item" @click="goDetail(item.id,item)">
<view class="u-line-1 item-cell" v-for="(column,i) in columnList" :key="i">
<view v-if="column.jnpfKey != 'table'">
<view class="" v-if="column.jnpfKey == 'relationForm'">
<text class="listTit u-line-1">{{column.label}}:</text>
<text class="listContent"
@click.stop="relationFormClick(item,column)"
style="color: blue;">{{item[column.prop]}}</text>
</view>
<view v-else class="u-line-1">
<text class="listTit u-line-1">{{column.label}}:</text>
<text class="listContent" v-if="['calculate','inputNumber'].includes(column.jnpfKey) && column.thousands">{{toThousands(item[column.prop],column)}}</text>
<text class="listContent" v-else>{{item[column.prop]}}</text>
</view>
</view>
<view class="collapse-box u-flex" v-else>
<tableCell :label="column.label" :childList="item[column.prop]" @cRelationForm="relationFormClick"
:children="column.children" ref="tableCell" :pageLen="3"></tableCell>
</view>
</view>
<view class="item-cell">
<text>审批状态：</text>
<text :class="getFlowStatus(item.flowState).statusCss">
{{getFlowStatus(item.flowState).text}}
</text>
</view>
</view>
<template v-slot:right>
<view class="right-option-box">
<view class="right-option" v-for="(it,i) in options" @click="handleClick(index)"
:key="i">
<text>{{it.text}}</text>
</view>
</view>
</template>
</uni-swipe-action-item>
</uni-swipe-action>
</view>
</view>
</mescroll-uni>
</view>
<view class="com-addBtn" @click="addPage()" >
<u-icon name="plus" size="60" color="#fff" />
</view>
<u-picker mode="selector" v-model="show" :default-selector="[0]" title="请选择流程" :range="templateList" range-key="fullName" @confirm="confirm"></u-picker>
</view>
</template>
<script>
import {
FlowJsonList
} from '@/api/workFlow/flowEngine'
import resources from '@/libs/resources.js'
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
import tableCell from '../dynamicModel/components/tableCell.vue'
import {getFormById} from '@/api/workFlow/workFlowForm'
import {
getDictionaryDataSelector,
getDataInterfaceRes,
getDefaultCurrentValueUserIdAsync,
getDefaultCurrentValueDepartmentIdAsync
} from '@/api/common'
import request from '@/utils/request'
export default {
mixins: [MescrollMixin],
components: {
tableCell
},
data() {
return {
show: false,
templateList: [],
sortValue: '',
searchForm: {
},
downOption: {
use: true,
auto: false
},
dataOptions:{
},
upOption: {
page: {
num: 0,
size: 20,
time: null,
},
empty: {
use: true,
icon: resources.message.nodata,
tip: "暂无数据",
fixed: true,
top: "300rpx",
zIndex: 5,
},
textNoMore: '没有更多数据',
toTop: {
bottom: 250
}
},
list: [],
appColumnList:[{"border":false,"jnpfKey":"radio","fullName":"类型","label":"类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"defaultValue":"1","dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_cw_payment_receipt","renderKey":1711516362983,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"medium","prop":"type","width":0,"options":[{"fullName":"采购付款","id":"1"},{"fullName":"销售付款","id":"2"},{"fullName":"其他付款","id":"3"}],"__vModel__":"type","style":{},"disabled":false,"interfaceHasPage":false,"fixed":"none","id":"type","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"}],
listQuery: {
moduleId:'547733293450172677',
sort: 'desc',
sidx: '',
keyword: '',
json: ''
},
options: [
{
text: '删除',
style: {
backgroundColor: '#dd524d'
}
}
],
sortOptions:[
],
ableAll:{
},
interfaceRes:{
},
menuId:'',
enCode: 'cwPaymentReceipt',
formId: '547733293450172677',
columnList:[],
isTree:false,
type:'1',
key:new Date(),
dataValue:{},
userInfo:{},
firstInitSearchData:false,
thousandsField:[],
formatType:{"yyyy":"yyyy","yyyy-MM":"yyyy-mm","yyyy-MM-dd":"yyyy-mm-dd","yyyy-MM-dd HH:mm":"yyyy-mm-dd hh:MM","yyyy-MM-dd HH:mm:ss":"yyyy-mm-dd hh:MM:ss","HH:mm:ss":"hh:MM:ss","HH:mm":"hh:MM"},
}
},
onLoad(e){
this.userInfo = uni.getStorageSync('userInfo') || {}
this.menuId = e.menuId
uni.$on('refresh', () => {
this.list = [];
this.mescroll.resetUpScroll();
})
this.dataAll()
this.getColumnList()
this.getFormById()
},
onUnload() {
uni.$off('refresh')
},
methods:{
toThousands(val, column) {
let num = Number(val)
let newVal = this.thousandsField.includes(column.__vModel__) ? num.toLocaleString('zh', {maximumFractionDigits: '2',minimumFractionDigits: '2'}): num.toFixed(2);
return newVal
},
getJsonList() {
FlowJsonList(this.flowId,'1').then(res => {
this.templateList = res.data;
})
},
getFormById() {
getFormById(this.formId).then(res => {
this.flowId = res.data&&res.data.id
this.enCode = res.data&&res.data.enCode
this.getJsonList()
})
},
dataAll(){
},
openData(e){
if(e==1){
//this.reset()
}
},
//初始化查询的默认数据
async initSearchData() {
this.dataValue = JSON.parse(JSON.stringify(this.searchForm))
},
relationFormClick(item,column) {
let vModel = column.__vModel__?column.__vModel__+"_id":column.__vModel__
let id = item[vModel]
if(vModel){
let [attr,attr1]=vModel.split("_jnpf_")
if(attr&&attr1){
attr = attr.replace('jnpf_','')
id = item[attr]&&item[attr][attr1]
}
}
let modelId = column.modelId
if (!id || !modelId) return
let config = {
modelId: modelId,
id: id,
formTitle: '详情',
noShowBtn: 1
}
this.$nextTick(() => {
const url ='/pages/apply/dynamicModel/detail?config=' + this.base64.encode(JSON.stringify(config),"UTF-8")
uni.navigateTo({
url: url
})
})
},
async upCallback(page) {
if(!this.firstInitSearchData) {
await this.initSearchData()
this.firstInitSearchData = true
}
const query = {
currentPage: page.num,
pageSize: page.size,
menuId : this.menuId,
...this.listQuery,
...this.searchForm,
dataType:0,
}
request({
url: '/api/scm/Cwpaymentreceipt/getList',
method: 'post',
data: query,
}).then(res => {
let _list = this.columnList.length?res.data.list:[];
this.mescroll.endSuccess(_list.length);
if (page.num == 1) this.list = [];
const list = _list.map(o => ({
show: false,
...o
}));
this.list = this.list.concat(_list);
}).catch(() => {
this.mescroll.endErr();
})
},
handleClick(index, index1) {
const item = this.list[index]
if([1,2,3,5].includes(item.flowState)){
this.$u.toast("流程正在审核,请勿删除")
this.list[index].show = false
return
}
request({
url: '/api/scm/Cwpaymentreceipt/' + item.id,
method: 'delete'
}).then(res => {
uni.showToast({
title: res.msg,
complete: () => {
this.$u.toast(res.msg)
this.mescroll.resetUpScroll()
}
})
})
},
open(index) {
this.list[index].show = true;
this.list.map((val, idx) => {
if (index != idx) this.list[idx].show = false;
})
},
search() {
if (this.isPreview == '1') return
this.searchTimer && clearTimeout(this.searchTimer)
this.searchTimer = setTimeout(() => {
this.list = [];
this.mescroll.resetUpScroll();
}, 300)
},
goDetail(id, item) {
let flowtaskid = item.flowtaskid
let flowState =item.flowState
let flowId =item.flowId
let btnType = ''
let btnList = []
btnList.push('btn_edit')
btnList.push('btn_detail')
if(btnList.includes('btn_detail')){
btnType = "btn_detail"
}
if(btnList.includes('btn_edit')){
btnType = "btn_edit"
}
if(!btnType) return
let ids = flowtaskid?flowtaskid:id
this.flowId = flowId?flowId:this.templateList[0].id
this.jumPage(ids, flowState,btnType)
},
addPage() {
if (!this.templateList.length) return this.$u.toast('流程不存在')
if (this.templateList.length > 1) {
this.show = true
} else {
this.flowId = this.templateList[0].id
this.jumPage()
}
},
confirm(e) {
this.flowId = this.templateList[e[0]].id
this.jumPage()
},
jumPage(id, status,btnType){
if (!id && !status) btnType = 'btn_add'
let _title=""
if(btnType=='btn_add'){
_title = "新增"
}
if(btnType=='btn_detail'){
_title = "详情"
}
if(btnType=='btn_edit'){
_title = "编辑"
}
let opType = '-1'
if ([1,2,5].includes(status)) opType = 0
const config = {
id: id || '',
enCode: this.enCode,
flowId: this.flowId,
formType: 1,
type: 1,
opType,
status: status || '',
fullName: _title,
jurisdictionType: btnType || ''
}
uni.navigateTo({
url: '/pages/workFlow/flowBefore/index?config=' + this.base64.encode(JSON.stringify(config), "UTF-8")
})
},
getFlowStatus(val) {
let status
switch (val) {
case 0:
status = {
text: '等待提交',
statusCss: 'u-type-info'
}
break;
case 1:
status = {
text: '等待审核',
statusCss: 'u-type-primary'
}
break;
case 2:
status = {
text: '审核通过',
statusCss: 'u-type-success'
}
break;
case 3:
status = {
text: '审核驳回',
statusCss: 'u-type-error'
}
break;
case 4:
status = {
text: '审核撤回',
statusCss: 'u-type-error'
}
break;
case 5:
status = {
text: '审核终止',
statusCss: 'u-type-info'
}
break;
default:
status = {
text: '等待提交',
statusCss: 'u-type-info'
}
break;
}
return status
},
getColumnList() {
let columnPermissionList = []
let _appColumnList =this.appColumnList
for (let i = 0; i < _appColumnList.length; i++) {
columnPermissionList.push(_appColumnList[i])
}
this.columnList = this.transformColumnList(columnPermissionList, this.dataOptions)
},
transformColumnList(columnList, dataOptions) {
let list = []
for (let i = 0; i < columnList.length; i++) {
let e = columnList[i]
let columProp = e.prop
let label = e.label
let option = null
let options = columProp + "Options"
if (!columProp.includes('-')) {
columProp = columProp
if(this.type=='4'){
columProp = columProp +"_name"
}
if(label.length>4){
label = label.substring(0, 4)
}
e.label = label
e.prop = columProp
e.option = option
list.push(e)
} else {
e.vModel = columProp.split('-')[1]
e.childLabel = e.label.split('-')[1]
options = e.vModel + "Options"
let prop = columProp.split('-')[0]
let label = e.label.split('-')[0]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
e.prop = e.prop
e.vModel = e.vModel
if(this.type=='4'){
e.prop = e.prop+"_name"
e.vModel = e.vModel+"_name"
}
e.option = option
list[i].children.push(e)
break
}
}
}
}
return list
},
cellClick(item) {
if (this.sortValue === item.value) return
this.listQuery.sort = item.sort
this.listQuery.sidx = item.sidx
this.sortValue = item.value
this.$refs.uDropdown.close();
this.$nextTick(() => {
this.list = [];
this.mescroll.resetUpScroll();
})
},
reset() {
this.searchForm = JSON.parse(JSON.stringify(this.dataValue))
this.key = new Date()
},
closeDropdown() {
this.$refs.uDropdown.close();
this.$nextTick(() => {
this.list = [];
this.mescroll.resetUpScroll();
})
},
dataList(data){
let _list =data.list
return _list;
},
},
}
</script>
<style lang="scss">
page {
background-color: #f0f2f6;
height: 100%;
/* #ifdef MP-ALIPAY */
position: absolute;
top: 0;
left: 0;
width: 100%;
/* #endif */
}
.right-option-box {
display: flex;
width: max-content;
.right-option {
width: 144rpx;
height: 100%;
font-size: 16px;
color: #fff;
background-color: #dd524d;
display: flex;
align-items: center;
justify-content: center;
}
.more-option {
background-color: #1890ff;
}
}
</style>

539
jnpf-app/pages/scm/index/cwsettlement/index.vue
View File

File diff suppressed because one or more lines are too long

16
jnpf-app/pages/workFlow/flowBefore/form.vue
Unescape View File

@ -86,6 +86,16 @@
@eventReceiver="eventReceiver"
v-if="config.formEnCode === 'costCode'"
/>
<cwpaymentreceipt
ref="form"
@eventReceiver="eventReceiver"
v-if="config.formEnCode === 'cwPaymentReceipt'"
/>
<cwsettlement
ref="form"
@eventReceiver="eventReceiver"
v-if="config.formEnCode === 'cwSettlement'"
/>
</template>
<template v-if="config.formType == 2">
<dynamicForm
@ -116,6 +126,8 @@ import workshopLine from "@/pages/scm/form/businessLine1/workshopLineIndex.vue";
import produceLine from "@/pages/scm/form/businessLine1/produceLineIndex.vue";
import warehousingReportloss from "@/pages/scm/form/warehousingReportloss/index.vue";
import cwCost from "@/pages/scm/form/cwCost/index.vue";
import cwpaymentreceipt from "@/pages/scm/form/cwpaymentreceipt/index.vue";
import cwsettlement from "@/pages/scm/form/cwsettlement/index.vue";
export default {
components: {
@ -135,7 +147,9 @@ export default {
workshopLine,
produceLine,
warehousingReportloss,
cwCost
cwCost,
cwpaymentreceipt,
cwsettlement
},
props: {
config: {

2
jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml
Unescape View File

@ -21,7 +21,7 @@ spring:
port: 3309
username: root
password: linus,.123
db-name: jnpf_init
db-name: jnpf_init_test
db-schema: #金仓达梦选填
prepare-url: #自定义url

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java
Unescape View File

@ -489,10 +489,9 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
for(DeliveryProductRelationEntity entitys : tableField144){
entitys.setId(RandomUtil.uuId());
entitys.setOrderId(entity.getId());
if(isSave){
if(isSave && entity.getReceiptType().equals("1")){
entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
entitys.setProduceTime(DateUtil.getNowDate());
}else{
}
deliveryProductRelationService.saveOrUpdate(entitys);
}

1
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
Unescape View File

@ -701,6 +701,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
warehousingOutboundProductEntity.setSpec(entitys.getSpec());
warehousingOutboundProductEntity.setOutboundNumber(entitys.getDeliveryNum());
warehousingOutboundProductEntity.setBatchNumber(entitys.getBatchNo());
warehousingOutboundProductEntity.setInventoryUnitId(entitys.getInventoryUnitId());
warehousingOutboundProductEntity.setDateManufacture(entitys.getProduceTime());
warehousingOutboundProductEntity.setCreatorUserId(deliveryOrder.getCreatorUserId());
warehousingOutboundProductEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId());

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
Unescape View File

@ -708,7 +708,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
if (receiptType.equals("1")) {
entity.setWarehousingStorageType("15");//采购收货单入库
}else if (receiptType.equals("2")){
entity.setWarehousingStorageType("16");//销售发货单出库
entity.setWarehousingStorageType("16");//销售收货单入库
}
entity.setWarehousingStorageStatus("3");//已入库
entity.setWarehousingId(receiptOrderForm.getId());

1
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
Unescape View File

@ -81,6 +81,7 @@ public class YunguanInterfaceController {
return ActionResult.fail("请推送状态为S的客户");
}
SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity();
subjectbasicEntity.setId(jsonObject.get("ID").toString());//ID
subjectbasicEntity.setName(jsonObject.get("CUST_FULL_NAME").toString());//名称
subjectbasicEntity.setCalssify("1");//一级
subjectbasicEntity.setSubjectBasicType("1");//客户

2
jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog title="选择司机" :close-on-click-modal="false" :visible.sync="visible"
<el-dialog title="选择数据" :close-on-click-modal="false" :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="800px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>

18
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
Unescape View File

@ -557,20 +557,16 @@ export default {
})
return
}
if (this.multipleSelectionItem.length > 1) {
this.$message({
type: 'error',
message: '只能选择一条数据',
duration: 1500,
})
return
}
const selectData = this.multipleSelectionItem
let stateFlag = true
let isSaleFlag = true
selectData.forEach(function (item) {
if (item.flowState != 2) {
stateFlag = false;
}
if (item.isSaleDeliveryVoucher == '2') {
isSaleFlag = false
}
});
if (!stateFlag) {
this.$message({
@ -580,14 +576,10 @@ export default {
})
return
}
let isSaleFlag = false
selectData.every(function (item) {
isSaleFlag = item.isSaleDeliveryVoucher == '1'
})
if (!isSaleFlag) {
this.$message({
type: 'error',
message: '订单已生成销售发货凭证',
message: '凭证已生成销售发货凭证',
duration: 1500,
})
return

4
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
Unescape View File

@ -1303,7 +1303,6 @@ export default {
initVoucherList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
debugger
let item = {
voucherId: e.voucherId,
voucherCode: e.voucherCode,
@ -1342,7 +1341,6 @@ export default {
if (this.dataForm.deliveryProductRelationList.length == 0) {
this.dataForm.deliveryProductRelationList.push(productEntity);
} else {
debugger
const product = this.dataForm.deliveryProductRelationList.find(item => item.id == productEntity.id)
if (product) {
product.netWeight = this.jnpf.floatAdd(product.netWeight, productEntity.netWeight)
@ -1350,6 +1348,7 @@ export default {
product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight)
product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight)
product.receivedQuantity = this.jnpf.floatAdd(product.receivedQuantity, productEntity.receivedQuantity)
product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum)
} else {
this.dataForm.deliveryProductRelationList.push(productEntity)
}
@ -1551,6 +1550,7 @@ export default {
target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight)
target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight)
target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight)
target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight)
}
this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
}).catch(() => {

8
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
Unescape View File

@ -1223,6 +1223,14 @@ export default {
},
//选择凭证弹窗
choiceVoucher() {
if (!this.dataForm.businessId) {
this.$message({
type: "error",
message: "请先选择销售订单",
duration: 1500
});
return;
}
this.voucherBoxVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {

8
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue
Unescape View File

@ -1193,6 +1193,14 @@ export default {
},
//选择凭证弹窗
choiceVoucher() {
if (!this.dataForm.businessId) {
this.$message({
type: "error",
message: "请先选择退货订单",
duration: 1500
});
return;
}
this.voucherBoxVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {

12
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue
Unescape View File

@ -1273,7 +1273,6 @@ export default {
businessType: '5',
}
this.dataForm.deliveryVoucherRelationList.push(item)
debugger
let productEntity = {}
e.warehousingOutboundProductEntityList.forEach(item => {
debugger
@ -1299,6 +1298,7 @@ export default {
product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight)
product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight)
product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight)
product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum)
} else {
this.dataForm.deliveryProductRelationList.push(productEntity)
}
@ -1489,22 +1489,22 @@ export default {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
const delObj = scope.row.list[0]
var productId = delObj.id
var unit = delObj.unit
const delObj = scope.row
var storageProductId = delObj.storageProductId
var productNetWeight = delObj.netWeight
var productGrossWeight = delObj.grossWeight
var productTareWeight = delObj.tareWeight
var productBuckleWeight = delObj.buckleWeight
const target = this.dataForm.deliveryProductRelationList.find(e => e.id == productId && e.deliveryUnit == unit)
const target = this.dataForm.deliveryProductRelationList.find(e => e.id == storageProductId)
if (target.netWeight == productNetWeight) {
const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == productId && e.deliveryUnit == unit)
const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == storageProductId)
this.dataForm.deliveryProductRelationList.splice(idx, 1)
} else {
target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight)
target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight)
target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight)
target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight)
target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight)
}
this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
}).catch(() => {

4
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
Unescape View File

@ -87,13 +87,13 @@
<el-table-column prop="businessCode" label="关联单号" align="center" width="200">
</el-table-column>
<el-table-column prop="warehouseId" label="出库仓库" align="center" width="150">
<el-table-column prop="warehouseId" label="出库仓库" align="center" width="200">
</el-table-column>
<el-table-column prop="salesNo" label="关联销售单号" align="center" width="200">
</el-table-column>
<el-table-column prop="receivedQuantity" label="实际出库数量" align="center" width="150">
<el-table-column prop="outNumber" label="实际出库数量" align="center" width="150">
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" align="center" width="150">

Write Preview
Loading…
Cancel
Save