修改费用单和飞书问题303，304

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwCostServiceImpl.java

@@ -224,12 +224,36 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
         });
 
             }
-
             if(ObjectUtil.isNotEmpty(cwCostPagination.getType())){
             cwCostNum++;
-
         cwCostQueryWrapper.lambda().eq(CwCostEntity::getType,cwCostPagination.getType());
+            }
 
+            if(ObjectUtil.isNotEmpty(cwCostPagination.getCostType())){
+                cwCostNum++;
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] costType = JsonUtil.getJsonToBean(cwCostPagination.getCostType(),String[][].class);
+                    for(int i=0;i<costType.length;i++){
+                        if(costType[i].length>0){
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(costType[i])));
+                        }
+                    }
+                }catch (Exception e1){
+                    try {
+                        List<String> costType = JsonUtil.getJsonToList(cwCostPagination.getCostType(),String.class);
+                        if(costType.size()>0){
+                            idList.addAll(costType);
+                        }
+                    }catch (Exception e2){
+                        idList.add(String.valueOf(cwCostPagination.getCostType()));
+                    }
+                }
+                cwCostQueryWrapper.lambda().and(t->{
+                    idList.forEach(tt->{
+                        t.like(CwCostEntity::getCostType, tt).or();
+                    });
+                });
             }
 
         }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java

@@ -95,10 +95,14 @@ public class BusinessLineController {
         List<BusinessLineEntity> list = businessLineService.list();
         List<BusinessLineEntity> workTreeList =new ArrayList<>();
         for (BusinessLineEntity businessLineEntity:list){
-            if (businessLineEntity.getDiffFlag().equals("3")||businessLineEntity.getDiffFlag().equals("5")){
+            if (businessLineEntity.getDiffFlag().equals("2")||businessLineEntity.getDiffFlag().equals("5")){
+               if (businessLineEntity.getDiffFlag().equals("2")&& businessLineEntity.getType().equals("1")){
+                   //type1是仓库 2是工厂
+               }else{
                    workTreeList.add(businessLineEntity);
                }
             }
+        }
         List<BusinessLineModel> models = JsonUtil.getJsonToList(workTreeList, BusinessLineModel.class);
         List<SumTree<BusinessLineModel>> trees = TreeDotUtils.convertListToTreeDot(models);
         List<BusinessLineSonTree> listVO = JsonUtil.getJsonToList(trees, BusinessLineSonTree.class);

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwCostEntity.java

@@ -19,6 +19,8 @@ public class CwCostEntity  {
     private String id;
     @TableField(value = "INSTITUTION_ID" , updateStrategy = FieldStrategy.IGNORED)
     private String institutionId;
+    @TableField(value = "COST_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String costType;
     @TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
     private String code;
     @TableField(value = "SUBJECT_ID" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwcost/CwCostForm.java

@@ -29,6 +29,9 @@ public class CwCostForm  {
     /** 费用归属 **/
     @JsonProperty("institutionId")
     private Object institutionId;
+    /** 费用单类型 **/
+    @JsonProperty("costType")
+    private Object costType;
     /** 往来单位 **/
     @JsonProperty("subjectId")
     private String subjectId;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwcost/CwCostPagination.java

@@ -42,4 +42,7 @@ public class CwCostPagination extends Pagination {
     /** 收付类型 */
     @JsonProperty("type")
     private Object type;
+    /** 费用单类型 */
+    @JsonProperty("costType")
+    private Object costType;
 }

jnpf-java-boot/jnpf-web/src/views/scm/businessline1/fatherVue.vue

@@ -161,7 +161,7 @@ export default {
       exportBoxVisible: false,
       treeData: [],
       treeActiveId: '',
-      diffFlag: '3',
+      diffFlag: '2',
       typeOptions: [],
       typeProps: { "label": "fullName", "value": "id" },
       parentIdOptions: [],

jnpf-java-boot/jnpf-web/src/views/scm/businessline3/form.vue

@@ -17,8 +17,9 @@ div -1
           </el-col>
           <el-col :span="8" v-if="judgeShow('code')">
             <jnpf-form-tip-item label="生产线编号" v-if="judgeShow('code')" prop="code">
-              <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="系统自动生成"
+              <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)"
-                :disabled="judgeWrite('code')" readonly :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" :disabled="judgeWrite('code')" readonly
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -31,48 +32,50 @@ div -1
           </el-col>
           <el-col :span="8" v-if="judgeShow('simpleName')">
             <jnpf-form-tip-item label=" 简称/英文名" v-if="judgeShow('simpleName')" prop="simpleName">
-              <JnpfInput v-model="dataForm.simpleName" @change="changeData('simpleName', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.simpleName" @change="changeData('simpleName', -1)"
-                :disabled="judgeWrite('simpleName')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('simpleName')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('type')">
             <jnpf-form-tip-item label="类型" v-if="judgeShow('type')" prop="type">
               <JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择"
-                :disabled="judgeWrite('type')" clearable :style='{ "width": "100%" }' :options="typeOptions"
+                :disabled="judgeWrite('type')" clearable :style='{ "width": "100%" }'
-                :props="typeProps">
+                :options="typeOptions" :props="typeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('parentId')">
             <jnpf-form-tip-item label="所属工厂" v-if="judgeShow('parentId')" prop="parentId">
-              <JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)" placeholder="请选择"
+              <JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)"
-                :disabled="judgeWrite('parentId')" clearable :style='{ "width": "100%" }' :options="parentIdOptions"
+                placeholder="请选择" :disabled="judgeWrite('parentId')" clearable
-                :props="parentIdProps">
+                :style='{ "width": "100%" }' :options="parentIdOptions" :props="parentIdProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('workshopId')">
             <jnpf-form-tip-item label="所属车间" v-if="judgeShow('workshopId')" prop="workshopId">
-              <JnpfSelect v-model="dataForm.workshopId" @change="changeData('workshopId', -1)" placeholder="请选择"
+              <JnpfSelect v-model="dataForm.workshopId" @change="changeData('workshopId', -1)"
-                :disabled="judgeWrite('workshopId')" clearable :style='{ "width": "100%" }' :options="workshopIdOptions"
+                placeholder="请选择" :disabled="judgeWrite('workshopId')" clearable
-                :props="workshopIdProps">
+                :style='{ "width": "100%" }' :options="workshopIdOptions" :props="workshopIdProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('status')">
             <jnpf-form-tip-item label="状态" v-if="judgeShow('status')" prop="status">
-              <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)" :disabled="judgeWrite('status')"
+              <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)"
-                optionType="button" direction="horizontal" :style='{ "width": "100%" }' size="large"
+                :disabled="judgeWrite('status')" optionType="button" direction="horizontal"
-                :options="statusOptions" :props="statusProps">
+                :style='{ "width": "100%" }' size="large" :options="statusOptions"
+                :props="statusProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('description')">
             <jnpf-form-tip-item label="描述" v-if="judgeShow('description')" prop="description">
-              <JnpfTextarea v-model="dataForm.description" @change="changeData('description', -1)" placeholder="请输入"
+              <JnpfTextarea v-model="dataForm.description" @change="changeData('description', -1)"
-                :disabled="judgeWrite('description')" clearable :style='{ "width": "100%" }'
+                placeholder="请输入" :disabled="judgeWrite('description')" clearable
-                :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                :style='{ "width": "100%" }' :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
@@ -89,15 +92,19 @@ div -1
               </div>
               <el-table :data="dataForm.businessContactList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')" prop="contactType">
+                <el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')"
+                  prop="contactType">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontactList-contactType')">*</span>类型
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontactList-contactType')">*</span>类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.contactType"
-                      @change="changeData('businesscontact1-contactType', scope.$index)" placeholder="请选择"
+                      @change="changeData('businesscontact1-contactType', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-contactType')"
-                      clearable :style='{ "width": "100%" }' :options="businesscontact1contactTypeOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="businesscontact1contactTypeOptions"
                       :props="businesscontact1contactTypeProps">
                     </JnpfSelect>
                   </template>
@@ -115,38 +122,45 @@ div -1
                   </template>
                 </el-table-column> -->
 
-                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name" align="center">
+                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name"
+                  align="center">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontact1-name')">*</span>姓名
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontact1-name')">*</span>姓名
                   </template>
                   <template slot-scope="scope">
-                    <JnpfUserSelect v-model="scope.row.name" @change="changeData('businesscontact1-name', scope.$index)"
+                    <JnpfUserSelect v-model="scope.row.name"
-                      placeholder="请选择" selectType="all" :ableIds="ableAll.businesscontact1nameableIds" clearable
+                      @change="changeData('businesscontact1-name', scope.$index)" placeholder="请选择"
+                      selectType="all" :ableIds="ableAll.businesscontact1nameableIds" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfUserSelect>
                   </template>
                 </el-table-column>
 
-
+                <el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')"
-                <el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')" prop="phone">
+                  prop="phone">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontactList-phone')">*</span>手机号
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontactList-phone')">*</span>手机号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.phone" @change="changeData('businesscontact1-phone', scope.$index)"
+                    <JnpfInput v-model="scope.row.phone"
-                      placeholder="请输入"
+                      @change="changeData('businesscontact1-phone', scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-phone')" clearable
+                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-phone')"
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')" prop="landline">
+                <el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')"
+                  prop="landline">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontactList-landline')">*</span>座机
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontactList-landline')">*</span>座机
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.landline"
-                      @change="changeData('businesscontact1-landline', scope.$index)" placeholder="请输入"
+                      @change="changeData('businesscontact1-landline', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-landline')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
@@ -154,25 +168,27 @@ div -1
                 </el-table-column>
                 <el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontactList-email')">*</span>邮箱
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontactList-email')">*</span>邮箱
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.email" @change="changeData('businesscontact1-email', scope.$index)"
+                    <JnpfInput v-model="scope.row.email"
-                      placeholder="请输入"
+                      @change="changeData('businesscontact1-email', scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-email')" clearable
+                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-email')"
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontactList-fax')">*</span>传真
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontactList-fax')">*</span>传真
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.fax" @change="changeData('businesscontact1-fax', scope.$index)"
+                    <JnpfInput v-model="scope.row.fax"
-                      placeholder="请输入"
+                      @change="changeData('businesscontact1-fax', scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-fax')" clearable
+                      :disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-fax')"
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -189,15 +205,17 @@ div -1
                   </template>
                 </el-table-column> -->
 
-                <el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')" prop="lastModifyTime">
+                <el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')"
+                  prop="lastModifyTime">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('businesscontact1-lastModifyTime')">*</span>更新时间
+                    <span class="required-sign"
+                      v-if="judgeRequired('businesscontact1-lastModifyTime')">*</span>更新时间
                   </template>
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.lastModifyTime"
                       @change="changeData('businesscontact1-lastModifyTime', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                      :startTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('businesscontact1List') || judgeWrite('businesscontact1-lastModifyTime')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
@@ -211,15 +229,16 @@ div -1
                   </template>
                 </el-table-column>
               </el-table>
-              <div class="table-actions" @click="addbusinesscontact1List()" v-if="!judgeWrite('businesscontactList')">
+              <div class="table-actions" @click="addbusinesscontact1List()"
+                v-if="!judgeWrite('businesscontactList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />

jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/form.vue

@@ -13,8 +13,9 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('code')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('code')" prop="code">
-                            <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="系统自动生成"
+              <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)"
-                                :disabled="judgeWrite('code')" readonly :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" :disabled="judgeWrite('code')" readonly
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -55,11 +56,29 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+
+          <!-- <el-col :span="8" v-if="judgeShow('costType')">
+            <jnpf-form-tip-item label="费用单类型" v-if="judgeShow('costType')" prop="costType">
+              <JnpfSelect v-model="dataForm.costType" @change="changeData('costType',-1)"
+                placeholder="请选择" :disabled="judgeWrite('costType')" clearable
+                :style='{"width":"100%"}' :options="costTypeOptions" :props="costTypeProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col> -->
+          <el-col :span="8" v-if="judgeShow('costType')">
+            <jnpf-form-tip-item label="费用单类型" v-if="judgeShow('costType')" prop="costType">
+              <JnpfSelect v-model="dataForm.costType" @change="changeData('costType',-1)"
+                placeholder="请选择" clearable :style='{"width":"100%"}' :options="costTypeOptions"
+                :props="costTypeProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-                            <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+              <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)"
-                                :disabled="judgeWrite('remark')" :maxlength="300" :style='{ "width": "100%" }' true
+                placeholder="请输入" :disabled="judgeWrite('remark')" :maxlength="300"
-                                type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                :style='{ "width": "100%" }' true type="textarea"
+                :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
@@ -81,8 +100,8 @@
           <el-col :span="8" v-if="judgeShow('type')">
             <jnpf-form-tip-item label="收付类型" v-if="judgeShow('type')" prop="type">
               <JnpfRadio v-model="dataForm.type" @change="changeData('type', -1)"
-                                :disabled="judgeWrite('type')" optionType="default" direction="horizontal" size="small"
+                :disabled="judgeWrite('type')" optionType="default" direction="horizontal"
-                                :options="typeOptions" :props="typeProps">
+                size="small" :options="typeOptions" :props="typeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
@@ -136,8 +155,9 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('payment')">
             <jnpf-form-tip-item label="收付款单号" v-if="judgeShow('payment')" prop="payment">
-                            <JnpfInput v-model="dataForm.payment" @change="changeData('payment', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.payment" @change="changeData('payment', -1)"
-                                :disabled="judgeWrite('payment')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('payment')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -159,8 +179,8 @@
           </el-col>
           <!-- 表单结束 -->
         </template>
-                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                    @select="addForSelect" @close="selectDialogVisible = false" />
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -215,6 +235,7 @@ export default {
         subjectId: undefined,
         costTime: undefined,
         businessCode: undefined,
+        costType: undefined,
         remark: undefined,
         costProject: [],
         type: undefined,
@@ -243,6 +264,13 @@ export default {
             trigger: 'change'
           },
         ],
+        costType: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
         costTime: [
           {
             required: true,
@@ -312,6 +340,8 @@ export default {
           },
         ],
       },
+      costTypeOptions: [{ "fullName": "常规费用", "id": "1" }, { "fullName": "抵扣保证金", "id": "2" }, { "fullName": "抵扣利息", "id": "3" }, { "fullName": "抵扣金额", "id": "4" }, { "fullName": "预付款", "id": "5" }, { "fullName": "预付款抵扣", "id": "6" }],
+      costTypeProps: { "label": "fullName", "value": "id" },
       subjectIdcolumnOptions: [{ "label": "类型", "value": "subjectBasicTypes" }, { "label": "名称", "value": "name" },],
       costProjectOptions: [{ "children": [{ "fullName": "交易服务费", "id": "E1001" }, { "fullName": "保险费", "id": "E1002" }, { "fullName": "包装费", "id": "E1003" }, { "fullName": "运费", "id": "E1004" }, { "fullName": "装卸费", "id": "E1005" }, { "fullName": "服务费", "id": "E1011" }, { "fullName": "管理服务费", "id": "E1012" }, { "fullName": "管理服务费退回", "id": "E1013" }, { "fullName": "海关税费", "id": "E1014" }, { "fullName": "技术服务费", "id": "E1015" }, { "fullName": "技术服务费退回", "id": "E1016" }, { "fullName": "交易手续费", "id": "E1017" }, { "fullName": "交易手续费-常规交易", "id": "E1018" }, { "fullName": "交易手续费退回", "id": "E1019" }, { "fullName": "金融服务费-预付回款", "id": "E1020" }, { "fullName": "金融服务费退回-垫资回款", "id": "E1021" }, { "fullName": "金融服务费-垫资回款", "id": "E1022" }, { "fullName": "运费", "id": "E1023" }, { "fullName": "运费退回", "id": "E1024" }, { "fullName": "平台服务费-账户管理费", "id": "E1025" }, { "fullName": "平台服务费-平台分销", "id": "E1026" }, { "fullName": "手续费", "id": "E1029" }, { "fullName": "手续费补贴", "id": "E1030" }, { "fullName": "保障服务费退回-退货运费", "id": "E1031" }, { "fullName": "保障服务费-退货运费", "id": "E1032" }, { "fullName": "保障服务费-担保费", "id": "E1033" }], "fullName": "销售服务", "id": "E1000" }, { "children": [{ "fullName": "采购保证金", "id": "E2000" }, { "fullName": "质量保证金", "id": "E2001" }, { "fullName": "销售保证金", "id": "E2002" }, { "fullName": "合作保证金", "id": "E2003" }], "fullName": "保证金", "id": "E200" }, { "children": [{ "fullName": "广告费", "id": "E3001" }, { "fullName": "促销费用", "id": "E3002" }, { "fullName": "节庆费", "id": "E3003" }, { "fullName": "订单返现费用", "id": "E3009" }], "fullName": "营销活动", "id": "E3000" }, { "children": [{ "fullName": "赔付", "id": "E4001" }, { "fullName": "水费", "id": "E4002" }, { "fullName": "电费", "id": "E4003" }, { "fullName": "气费", "id": "E4004" }, { "fullName": "物业管理费", "id": "E4005" }, { "fullName": "物料消耗", "id": "E4006" }, { "fullName": "信息使用费", "id": "E4007" }, { "fullName": "展览费", "id": "E4008" }, { "fullName": "租赁费", "id": "E4009" }, { "fullName": "修理费", "id": "E4010" }], "fullName": "销售场地", "id": "E4000" }, { "children": [{ "fullName": "折旧费", "id": "E5001" }, { "fullName": "人员工资", "id": "E5002" }, { "fullName": "职工福利费", "id": "E5003" }, { "fullName": "差旅费", "id": "E5004" }], "fullName": "销售人员", "id": "E5000" }, { "children": [{ "fullName": "办公费", "id": "E6001" }, { "fullName": "委托代销手续费", "id": "E6002" }, { "fullName": "销售提成", "id": "E6003" }, { "fullName": "采购奖励", "id": "E6004" }, { "fullName": "佣金退回撤销-分销", "id": "E6006" }, { "fullName": "佣金退回-销售员", "id": "E6007" }, { "fullName": "佣金退回-分销", "id": "E6008" }, { "fullName": "佣金-销售员", "id": "E6009" }, { "fullName": "佣金-分销", "id": "E6011" }, { "fullName": "奖励", "id": "E6012" }], "fullName": "委托销售", "id": "E6000" }],
       costProjectProps: { "label": "fullName", "value": "id", "children": "children" },
@@ -332,6 +362,7 @@ export default {
         subjectId: [],
         costTime: [],
         businessCode: [],
+        costType: [],
         remark: [],
         costProject: [],
         type: [],

jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue

@@ -16,8 +16,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="费用发生时间">
-                            <JnpfDateRangePicker v-model="query.costTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+              <JnpfDateRangePicker v-model="query.costTime" format="yyyy-MM-dd"
-                                endPlaceholder="结束日期">
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -35,12 +35,21 @@
                 </JnpfSelect>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用单类型">
+                <JnpfSelect v-model="query.costType" placeholder="请选择" clearable
+                  :options="costTypeOptions" :props="costTypeProps" multiple>
+                </JnpfSelect>
+              </el-form-item>
+            </el-col>
+
           </template>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -74,9 +83,11 @@
             </el-tooltip>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          custom-column border @selection-change="handleSelectionChange"
-                    <el-table-column prop="code" label="单据编号" align="center" fixed="left" sortable width="250px">
+          :span-method="arraySpanMethod">
+          <el-table-column prop="code" label="单据编号" align="center" fixed="left" sortable
+            width="250px">
           </el-table-column>
           <el-table-column prop="institutionId" label="费用归属" align="center" fixed="left" sortable
             width="250px">
@@ -98,7 +109,6 @@
           <el-table-column prop="2" label="关联收付款单" align="center" width="200px">
           </el-table-column>
 
-
           <el-table-column label="收付类型" prop="type" align="center" width="200px">
             <template slot-scope="scope">
               {{ scope.row.type }}
@@ -114,6 +124,12 @@
               {{ scope.row.wayStatus }}
             </template>
           </el-table-column>
+          <el-table-column label="费用单类型" prop="costType" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.costType}}
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column prop="costPrice" label="费用金额" align="center">
                     </el-table-column> -->
           <el-table-column prop="flowState" label="状态" width="150px" align="center">
@@ -140,20 +156,20 @@
             </template>
           </el-table-column>
         </JNPF-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+        <pagination :total="total" :page.sync="listQuery.currentPage"
-                    @pagination="initData" />
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
-
-
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-        <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-            class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-                <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">
           {{ item.fullName }}
         </div>
       </el-scrollbar>
@@ -161,7 +177,8 @@
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
       @superQuery="superQuery" />
   </div>
@@ -215,6 +232,7 @@ export default {
         costTime: undefined,
         costProject: undefined,
         type: undefined,
+        costType: undefined,
       },
       treeProps: {
         children: 'children',
@@ -238,6 +256,8 @@ export default {
       flowListVisible: false,
       flowList: [],
       exportBoxVisible: false,
+      costTypeOptions: [{ "fullName": "常规费用", "id": "1" }, { "fullName": "抵扣保证金", "id": "2" }, { "fullName": "抵扣利息", "id": "3" }, { "fullName": "抵扣金额", "id": "4" }, { "fullName": "预付款", "id": "5" }, { "fullName": "预付款抵扣", "id": "6" }],
+      costTypeProps: { "label": "fullName", "value": "id" },
       costProjectOptions: [{ "children": [{ "fullName": "交易服务费", "id": "E1001" }, { "fullName": "保险费", "id": "E1002" }, { "fullName": "包装费", "id": "E1003" }, { "fullName": "运费", "id": "E1004" }, { "fullName": "装卸费", "id": "E1005" }, { "fullName": "服务费", "id": "E1011" }, { "fullName": "管理服务费", "id": "E1012" }, { "fullName": "管理服务费退回", "id": "E1013" }, { "fullName": "海关税费", "id": "E1014" }, { "fullName": "技术服务费", "id": "E1015" }, { "fullName": "技术服务费退回", "id": "E1016" }, { "fullName": "交易手续费", "id": "E1017" }, { "fullName": "交易手续费-常规交易", "id": "E1018" }, { "fullName": "交易手续费退回", "id": "E1019" }, { "fullName": "金融服务费-预付回款", "id": "E1020" }, { "fullName": "金融服务费退回-垫资回款", "id": "E1021" }, { "fullName": "金融服务费-垫资回款", "id": "E1022" }, { "fullName": "运费", "id": "E1023" }, { "fullName": "运费退回", "id": "E1024" }, { "fullName": "平台服务费-账户管理费", "id": "E1025" }, { "fullName": "平台服务费-平台分销", "id": "E1026" }, { "fullName": "手续费", "id": "E1029" }, { "fullName": "手续费补贴", "id": "E1030" }, { "fullName": "保障服务费退回-退货运费", "id": "E1031" }, { "fullName": "保障服务费-退货运费", "id": "E1032" }, { "fullName": "保障服务费-担保费", "id": "E1033" }], "fullName": "销售服务", "id": "E1000" }, { "children": [{ "fullName": "采购保证金", "id": "E2000" }, { "fullName": "质量保证金", "id": "E2001" }, { "fullName": "销售保证金", "id": "E2002" }, { "fullName": "合作保证金", "id": "E2003" }], "fullName": "保证金", "id": "E200" }, { "children": [{ "fullName": "广告费", "id": "E3001" }, { "fullName": "促销费用", "id": "E3002" }, { "fullName": "节庆费", "id": "E3003" }, { "fullName": "订单返现费用", "id": "E3009" }], "fullName": "营销活动", "id": "E3000" }, { "children": [{ "fullName": "赔付", "id": "E4001" }, { "fullName": "水费", "id": "E4002" }, { "fullName": "电费", "id": "E4003" }, { "fullName": "气费", "id": "E4004" }, { "fullName": "物业管理费", "id": "E4005" }, { "fullName": "物料消耗", "id": "E4006" }, { "fullName": "信息使用费", "id": "E4007" }, { "fullName": "展览费", "id": "E4008" }, { "fullName": "租赁费", "id": "E4009" }, { "fullName": "修理费", "id": "E4010" }], "fullName": "销售场地", "id": "E4000" }, { "children": [{ "fullName": "折旧费", "id": "E5001" }, { "fullName": "人员工资", "id": "E5002" }, { "fullName": "职工福利费", "id": "E5003" }, { "fullName": "差旅费", "id": "E5004" }], "fullName": "销售人员", "id": "E5000" }, { "children": [{ "fullName": "办公费", "id": "E6001" }, { "fullName": "委托代销手续费", "id": "E6002" }, { "fullName": "销售提成", "id": "E6003" }, { "fullName": "采购奖励", "id": "E6004" }, { "fullName": "佣金退回撤销-分销", "id": "E6006" }, { "fullName": "佣金退回-销售员", "id": "E6007" }, { "fullName": "佣金退回-分销", "id": "E6008" }, { "fullName": "佣金-销售员", "id": "E6009" }, { "fullName": "佣金-分销", "id": "E6011" }, { "fullName": "奖励", "id": "E6012" }], "fullName": "委托销售", "id": "E6000" }],
       costProjectProps: { "label": "fullName", "value": "id", "children": "children" },
       typeOptions: [{ "fullName": "收款", "id": "1" }, { "fullName": "付款", "id": "2" }],

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue

@@ -185,7 +185,7 @@
                 </el-table-column>
 
                 <el-table-column label="商品分类"
-                  v-if="judgeShow('warehousinginventoryproduct-categoryName')" prop="categoryName"
+                  v-if="judgeShow('warehousinginventoryproduct-categoryName')" prop="productTypeIds"
                   align="center" width="220">
 
                   <template slot="header">
@@ -194,7 +194,7 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.categoryName"
+                    <JnpfInput v-model="scope.row.productTypeIds"
                       @change="changeData('warehousinginventoryproduct-categoryName', scope.$index)"
                       placeholder="请输入"
                       :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-categoryName')"
@@ -214,45 +214,49 @@
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryNumber"
-                      @change="changeData('warehousinginventoryproduct-firmOfferQuantity', scope.$index)"
+                      @change="grossWeightChange(scope.$index)" placeholder="请输入" disabled clearable
-                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <!-- <el-table-column label="品牌"
+                <el-table-column label="实盘数量"
-                  v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName"
+                  v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
-                  align="center" width="220">
+                  prop="firmOfferQuantity" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
-                      v-if="judgeRequired('warehousinginventoryproductList-brandName')">*</span>品牌
+                      v-if="judgeRequired('warehousinginventoryproductList-firmOfferQuantity')">*</span>实盘数量
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.brandName"
+                    <JnpfInput v-model="scope.row.firmOfferQuantity"
-                      @change="changeData('warehousinginventoryproduct-brandName', scope.$index)"
+                      @input="grossWeightChange(scope.$index)" placeholder="请输入"
-                      placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
-                      :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-brandName')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
+                    <!-- <JnpfInput v-model="scope.row.firmOfferQuantity"
+                      @change="grossWeightChange(scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput> -->
                   </template>
-                </el-table-column> -->
+                </el-table-column>
 
-                <el-table-column label="实盘数量"
+                <el-table-column label="盈亏数量"
-                  v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
+                  v-if="judgeShow('warehousinginventoryproduct-profitAndLossQuantity')"
-                  prop="firmOfferQuantity" align="center" width="220">
+                  prop="profitAndLossQuantity" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
-                      v-if="judgeRequired('warehousinginventoryproductList-firmOfferQuantity')">*</span>实盘数量
+                      v-if="judgeRequired('warehousinginventoryproductList-profitAndLossQuantity')">*</span>盈亏数量
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.firmOfferQuantity"
+                    <JnpfInput v-model="scope.row.profitAndLossQuantity"
-                      @change="changeData('warehousinginventoryproduct-firmOfferQuantity', scope.$index)"
+                      @change="changeData('warehousinginventoryproduct-profitAndLossQuantity', scope.$index)"
                       placeholder="请输入"
-                      :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
+                      :disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-profitAndLossQuantity')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -404,6 +408,7 @@ export default {
           dateManufacture: '',
           productIdOptions: [],
           firmOfferQuantity: '',
+          profitAndLossQuantity: '',
           firmOfferQuantityOptions: [],
           enabledmark: undefined
         },
@@ -516,6 +521,9 @@ export default {
   },
   mounted() { },
   methods: {
+    grossWeightChange(index) {
+      this.dataForm.warehousingInventoryProductList[index].profitAndLossQuantity = this.jnpf.floatSub(this.dataForm.warehousingInventoryProductList[index].inventoryNumber, this.dataForm.warehousingInventoryProductList[index].firmOfferQuantity)
+    },
 
     productBatch(model, row) {
       row.productId = row.id
@@ -556,7 +564,8 @@ export default {
           productTypeIds: e.productTypeId,
           inventoryNumber: e.inventoryNumber,
           batchNumber: e.batchNumber,
-          creatorTime: e.creatorTime,
+          dateManufacture: e.creatorTime,
+          productTypeIds: e.productTypeIds,
         }
         this.dataForm.warehousingInventoryProductList.push(item)
       }
@@ -679,6 +688,7 @@ export default {
       let item = {
         productId: '',
         firmOfferQuantity: undefined,
+        profitAndLossQuantity: undefined,
         cargoId: '',
       }
       this.getwarehousinginventoryproductList(item)