修改入库单添加失败

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

@@ -114,7 +114,7 @@ public class WarehousingNotificationController {
             realList.add(warehousingNotificationMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, WarehousingNotificationConstant.getFormData(), WarehousingNotificationConstant.getColumnData(), warehousingNotificationPagination.getModuleId(),false);
+//        realList = generaterSwapUtil.swapDataList(realList, WarehousingNotificationConstant.getFormData(), WarehousingNotificationConstant.getColumnData(), warehousingNotificationPagination.getModuleId(),false);
 
         //流程状态添加
         for(Map<String, Object> vo:realList){

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

@@ -174,8 +174,8 @@ public class WarehousingOutboundController {
      * @param warehousingOutboundForm
      * @return
      */
-    @PostMapping("/{idWork}")
-    @Operation(summary = "创建")
+    @PostMapping("/Work/{id}")
+    @Operation(summary = "创建work")
     public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingOutboundForm warehousingOutboundForm) {
 //        String b = warehousingOutboundService.checkForm(warehousingOutboundForm,0);
 //        if (StringUtil.isNotEmpty(b)){

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

@@ -447,13 +447,13 @@ public class WarehousingReceiveController {
      * @param warehousingReceiveForm
      * @return
      */
-    @PostMapping("/{idssWork}")
-    @Operation(summary = "创建")
+    @PostMapping("/Work/{id}")
+    @Operation(summary = "加工单创建领用单")
     public ActionResult createWorkOrder(@PathVariable("id") String id, @RequestBody @Valid WarehousingReceiveForm warehousingReceiveForm) {
-        String b = warehousingReceiveService.checkForm(warehousingReceiveForm,0);
-        if (StringUtil.isNotEmpty(b)){
-            return ActionResult.fail(b );
-        }
+//        String b = warehousingReceiveService.checkForm(warehousingReceiveForm,0);
+//        if (StringUtil.isNotEmpty(b)){
+//            return ActionResult.fail(b );
+//        }
         try{
             warehousingReceiveService.saveOrUpdateWorkOrder(warehousingReceiveForm, id ,true);
         }catch(Exception e){

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

@@ -156,7 +156,7 @@ public class WarehousingReportlossController {
      * @param warehousingReportlossForm
      * @return
      */
-    @PostMapping("/{idWork}")
+    @PostMapping("/Work/{id}")
     @Operation(summary = "创建")
     public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingReportlossForm warehousingReportlossForm) {
 //        String b = warehousingReportlossService.checkForm(warehousingReportlossForm,0);

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

@@ -152,13 +152,13 @@ public class WarehousingReturnController {
 
 
     /**
-     * 创建
+     * 加工单创建的
      *
      * @param warehousingReturnForm
      * @return
      */
-    @PostMapping("/{idWork}")
-    @Operation(summary = "创建")
+    @PostMapping("/Work/{id}")
+    @Operation(summary = "加工单创建的")
     public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingReturnForm warehousingReturnForm) {
 //        String b = warehousingReturnService.checkForm(warehousingReturnForm,0);
 //        if (StringUtil.isNotEmpty(b)){

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

@@ -173,8 +173,8 @@ public class WarehousingStorageController {
      * @param warehousingStorageForm
      * @return
      */
-    @PostMapping("/{idWork}")
-    @Operation(summary = "创建")
+    @PostMapping("/Work/{id}")
+    @Operation(summary = "work创建入库")
     public ActionResult createWork(@PathVariable("id") String id, @RequestBody @Valid WarehousingStorageForm warehousingStorageForm) {
 //        String b = warehousingStorageService.checkForm(warehousingStorageForm,0);
 //        if (StringUtil.isNotEmpty(b)){

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

@@ -1,8 +1,8 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right"
-        :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -13,15 +13,18 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('documentNo')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
-              <JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo', -1)" placeholder="系统自动生成"
-                :disabled="judgeWrite('documentNo')" readonly :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo', -1)"
+                placeholder="系统自动生成" :disabled="judgeWrite('documentNo')" readonly
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingStorageType')">
-            <jnpf-form-tip-item label="业务类型" v-if="judgeShow('warehousingStorageType')" prop="warehousingStorageType">
-              <JnpfSelect v-model="dataForm.warehousingStorageType" @change="changeData('warehousingStorageType', -1)"
-                placeholder="请选择" :disabled="judgeWrite('warehousingStorageType')" clearable
+            <jnpf-form-tip-item label="业务类型" v-if="judgeShow('warehousingStorageType')"
+              prop="warehousingStorageType">
+              <JnpfSelect v-model="dataForm.warehousingStorageType"
+                @change="changeData('warehousingStorageType', -1)" placeholder="请选择"
+                :disabled="judgeWrite('warehousingStorageType')" clearable
                 :style='{ "width": "100%" }' :options="warehousingStorageTypeOptions"
                 :props="warehousingStorageTypeProps">
               </JnpfSelect>
@@ -29,41 +32,46 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingId')">
             <jnpf-form-tip-item label="关联单号" v-if="judgeShow('warehousingId')" prop="warehousingId">
-              <JnpfPopupSelect v-model="dataForm.warehousingId" @change="changeData('warehousingId', -1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehousingId" placeholder="请选择"
-                :disabled="judgeWrite('warehousingId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='warehousing_code' field='warehousingId'
-                interfaceId="529616482762510213" :pageSize="20" :columnOptions="warehousingIdcolumnOptions" clearable
-                :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.warehousingId"
+                @change="changeData('warehousingId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.warehousingId" placeholder="请选择"
+                :disabled="judgeWrite('warehousingId')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='warehousing_code'
+                field='warehousingId' interfaceId="529616482762510213" :pageSize="20"
+                :columnOptions="warehousingIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehouseId')">
             <jnpf-form-tip-item label="入库仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
-              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
-                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.warehouseId"
+                @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
+                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
+                interfaceId="529617754022498181" :pageSize="20"
+                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
 
               </JnpfPopupSelect>
 
             </jnpf-form-tip-item>
           </el-col>
-          <!-- {{ dataForm.warehouseId }} -->
           <el-col :span="8" v-if="judgeShow('warehousingTime')">
-            <jnpf-form-tip-item label="入库时间" v-if="judgeShow('warehousingTime')" prop="warehousingTime">
-              <JnpfDatePicker v-model="dataForm.warehousingTime" @change="changeData('warehousingTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
-                :disabled="judgeWrite('warehousingTime')" clearable :style='{ "width": "100%" }' type="date"
-                format="yyyy-MM-dd">
+            <jnpf-form-tip-item label="入库时间" v-if="judgeShow('warehousingTime')"
+              prop="warehousingTime">
+              <JnpfDatePicker v-model="dataForm.warehousingTime"
+                @change="changeData('warehousingTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                placeholder="请选择" :disabled="judgeWrite('warehousingTime')" clearable
+                :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </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">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
-                :disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
+                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -77,7 +85,8 @@
             <jnpf-form-tip-item label-width="0">
               <el-table :data="dataForm.warehousingStoragePoundlistList" size='mini' border>
                 <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="关联凭证" v-if="judgeShow('warehousingstoragepoundlist-voucherId')" prop="voucherId"
+                <el-table-column label="关联凭证"
+                  v-if="judgeShow('warehousingstoragepoundlist-voucherId')" prop="voucherId"
                   align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
@@ -85,13 +94,16 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.warehousingstoragepoundlistvoucherId"
+                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.warehousingstoragepoundlistvoucherId"
                       placeholder="请选择"
                       :disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-voucherId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucher_code' :field="'voucherId' + scope.$index" interfaceId="529621469341175685"
-                      :pageSize="20" :columnOptions="warehousingstoragepoundlistvoucherIdcolumnOptions" clearable
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='voucher_code'
+                      :field="'voucherId' + scope.$index" interfaceId="529621469341175685"
+                      :pageSize="20"
+                      :columnOptions="warehousingstoragepoundlistvoucherIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
@@ -288,7 +300,8 @@
               </div>
               <el-table :data="dataForm.warehousingStorageProductList" size='mini' border>
                 <el-table-column type="index" width="50" fixed="left" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousingstorageproduct-productId')" prop="productId"
+                <el-table-column label="商品名称"
+                  v-if="judgeShow('warehousingstorageproduct-productId')" prop="productId"
                   width="200" fixed="left" align="center">
 
                   <template slot="header">
@@ -297,13 +310,15 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.warehousingstorageproductproductId"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.warehousingstorageproductproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='name' :field="'productId' + scope.$index" interfaceId="529622659227471749"
-                      :pageSize="20" :columnOptions="warehousingstorageproductproductIdcolumnOptions" clearable
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="529622659227471749" :pageSize="20"
+                      :columnOptions="warehousingstorageproductproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
@@ -329,14 +344,15 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled clearable
-                      :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="入库单位" v-if="judgeShow('warehousingstorageproduct-storageUnit')"
-                  prop="storageUnit" width="200" align="center">
+                <el-table-column label="入库单位"
+                  v-if="judgeShow('warehousingstorageproduct-storageUnit')" prop="storageUnit"
+                  width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -347,11 +363,14 @@
                     <JnpfPopupSelect v-model="scope.row.storageUnit"
                       @change="changeData('warehousingstorageproduct-storageUnit', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingstorageproductstorageUnit" placeholder="请选择"
+                      :templateJson="interfaceRes.warehousingstorageproductstorageUnit"
+                      placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-storageUnit')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='unit_name' :field="'storageUnit' + scope.$index" interfaceId="523054191598383685"
-                      :pageSize="20" :columnOptions="warehousingstorageproductstorageUnitcolumnOptions" clearable
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='unit_name'
+                      :field="'storageUnit' + scope.$index" interfaceId="523054191598383685"
+                      :pageSize="20"
+                      :columnOptions="warehousingstorageproductstorageUnitcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
@@ -370,8 +389,9 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="入库货区" v-if="judgeShow('warehousingstorageproduct-storageAreaId')"
-                  prop="storageAreaId" width="200" align="center">
+                <el-table-column label="入库货区"
+                  v-if="judgeShow('warehousingstorageproduct-storageAreaId')" prop="storageAreaId"
+                  width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -382,18 +402,21 @@
                     <JnpfPopupSelect v-model="scope.row.storageAreaId"
                       @change="changeData('warehousingstorageproduct-storageAreaId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingstorageproductstorageAreaId" placeholder="请选择"
+                      :templateJson="interfaceRes.warehousingstorageproductstorageAreaId"
+                      placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-storageAreaId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='cargo_name' :field="'storageAreaId' + scope.$index"
-                      interfaceId="529624294691458949" :pageSize="20"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='cargo_name'
+                      :field="'storageAreaId' + scope.$index" interfaceId="529624294691458949"
+                      :pageSize="20"
                       :columnOptions="warehousingstorageproductstorageAreaIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="入库数量" v-if="judgeShow('warehousingstorageproduct-storageNumber')"
-                  prop="storageNumber" width="200" align="center">
+                <el-table-column label="入库数量"
+                  v-if="judgeShow('warehousingstorageproduct-storageNumber')" prop="storageNumber"
+                  width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -402,14 +425,16 @@
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.storageNumber"
-                      @change="changeData('warehousingstorageproduct-storageNumber', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousingstorageproduct-storageNumber', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-storageNumber')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="批次号" v-if="judgeShow('warehousingstorageproduct-batchNumber')"
-                  prop="batchNumber" width="200" align="center">
+                <el-table-column label="批次号"
+                  v-if="judgeShow('warehousingstorageproduct-batchNumber')" prop="batchNumber"
+                  width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -418,13 +443,14 @@
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.batchNumber"
-                      @change="changeData('warehousingstorageproduct-batchNumber', scope.$index)" placeholder="系统自动生成"
-                      disabled readonly :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingstorageproduct-batchNumber', scope.$index)"
+                      placeholder="系统自动生成" disabled readonly :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="生产日期" v-if="judgeShow('warehousingstorageproduct-dateManufacture')"
+                <el-table-column label="生产日期"
+                  v-if="judgeShow('warehousingstorageproduct-dateManufacture')"
                   prop="dateManufacture" width="200" align="center">
 
                   <template slot="header">
@@ -435,8 +461,8 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.dateManufacture"
                       @change="changeData('warehousingstorageproduct-dateManufacture', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-dateManufacture')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
@@ -459,8 +485,8 @@
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -655,6 +681,8 @@ export default {
 
     initStorageData() {
       const data = this.setting.selectData
+      console.log(this.setting.selectData);
+
       // if (data.flag == '采购收货凭证生成采购单') {
       //   this.dataForm.firstSubjectBasicId = data[0].supplierId
       //   this.dataForm.enterpriseId = data[0].customerId
@@ -664,7 +692,10 @@ export default {
       //   });
       // }
       if (data && data.flag == '入库通知转入库单') {
-        this.dataForm.warehousingId = data.id
+        console.log(data);
+        this.dataForm.warehousingId = data.id,
+          this.dataForm.warehouseId = data.warehouseId
+
         // this.dataForm.businessLineId = data[0].businessLineId_id
         // this.dataForm.counterpartOrderCode = data[0].counterpartOrderCode
         // this.dataForm.urgentOrder = data[0].urgentOrder

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

@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousingType')">
             <jnpf-form-tip-item label-width="0" prop="warehousingType">
@@ -40,10 +40,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="采购订单" v-if="judgeShow('businessId')" prop="businessId">
@@ -264,10 +264,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">收货信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">收货信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectBasicId')">
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectBasicId')"
@@ -292,10 +292,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">发货信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">发货信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
@@ -334,10 +334,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
@@ -348,10 +348,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-              <div style="padding:15px 0px">
-                  <span style="color: #409EFF;">▋</span>
-                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
-              </div>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">

jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue

@@ -22,7 +22,8 @@
             <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="addOrUpdateHandle()">新增
             </el-button> -->
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -38,18 +39,23 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
 
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
-          <el-table-column prop="warehousingCode" label="通知编号" align="center" sortable width="150" fixed="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column prop="warehousingCode" label="通知编号" align="center" sortable width="150"
+            fixed="left">
           </el-table-column>
-          <el-table-column prop="businessId" label="采购订单" align="center" sortable width="150" fixed="left">
+          <el-table-column prop="businessId" label="采购订单" align="center" sortable width="150"
+            fixed="left">
           </el-table-column>
-          <el-table-column prop="subjectBasicId" label="供应商名称" align="center" sortable width="150" fixed="left">
+          <el-table-column prop="subjectBasicId" label="供应商名称" align="center" sortable width="150"
+            fixed="left">
           </el-table-column>
           <el-table-column prop="shippingAddress" label="收货地址" align="center" width="150">
           </el-table-column>
@@ -58,12 +64,14 @@
           <el-table-column prop="warehouseId" label="入库仓库" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="notificationStorageNumber" label="计划入库数量" align="center" width="150">
+          <el-table-column prop="notificationStorageNumber" label="计划入库数量" align="center"
+            width="150">
           </el-table-column>
 
           <el-table-column prop="receivedQantity" label="已确认入库数量" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="remainingStockableQuantity" label="待确认入库数量" align="center" width="150">
+          <el-table-column prop="remainingStockableQuantity" label="待确认入库数量" align="center"
+            width="150">
           </el-table-column>
           <el-table-column prop="warehouseId" label="期望送达时间" align="center" width="150">
           </el-table-column>
@@ -108,32 +116,37 @@
               </el-button> -->
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
-              <el-button size="mini" type="text" v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">入库</el-button>
+              <el-button size="mini" type="text" v-has="'btn-warehousing'"
+                @click="addwarehousing(scope.row)">入库</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :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"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :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)">{{item.fullName}}
         </div> -->
-        <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)">{{ "入库单" }}
         </div>
       </el-scrollbar>
     </el-dialog>
     <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" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
     <purRouter v-if="purVisible" ref="purRouter" @refresh="initData" />
 
   </div>