解决冲突

src/views/basicdata/area/index.vue

@@ -124,7 +124,7 @@
     />
 
     <!-- 添加或修改库区对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="存储id 显示名称 下拉选择仓库，对应t_warehous的f_id" prop="fWarehouseid">
           <el-select v-model="form.fWarehouseid" placeholder="请选择存储id 显示名称 下拉选择仓库，对应t_warehous的f_id">

src/views/basicdata/company/index.vue

@@ -108,7 +108,7 @@
     />
 
     <!-- 添加或修改公司名称对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="公司编号" prop="fNo">
           <el-input v-model="form.fNo" placeholder="请输入公司编号" />

src/views/basicdata/contact/index.vue

@@ -128,7 +128,7 @@
     />
 
     <!-- 添加或修改客户联系人对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="对应corps 的f_id" prop="fPid">
           <el-input v-model="form.fPid" placeholder="请输入对应corps 的f_id" />

src/views/basicdata/corps/index.vue

@@ -220,7 +220,7 @@
     />
 
     <!-- 添加或修改客户详情对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="766px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="766px" :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-row>

src/views/basicdata/fees/index.vue

@@ -155,7 +155,7 @@
     />
 
     <!-- 添加或修改费用信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-row>

src/views/basicdata/goods/index.vue

@@ -194,7 +194,7 @@
     />
 
     <!-- 添加或修改商品详情对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <!--<el-form-item label="存储id" prop="fTypeid">
           <el-input v-model="form.fTypeid" placeholder="请输入存储id" />

src/views/basicdata/location/index.vue

@@ -124,7 +124,7 @@
     />
 
     <!-- 添加或修改库位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="存储id 显示名称 下拉选择仓库，对应t_ warehouse_area的f_id" prop="fWarehouseAreaId">
           <el-select v-model="form.fWarehouseAreaId" placeholder="请选择存储id 显示名称 下拉选择仓库，对应t_ warehouse_area的f_id">

src/views/basicdata/warehouse/index.vue

@@ -143,7 +143,7 @@
     />
 
     <!-- 添加或修改仓库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

src/views/basicdata/warehousebills/index.vue

@@ -400,7 +400,7 @@ RK CK DB HZ
     />
 
     <!-- 添加或修改仓库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="业务编号，格式RK+YYYY+YY+NNN，
 编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。

src/views/monitor/job/index.vue

@@ -133,7 +133,7 @@
     />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -211,7 +211,7 @@
     </el-dialog>
 
     <!-- 任务日志详细 -->
-    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+    <el-dialog title="任务详细" :visible.sync="openView" :close-on-click-modal="false" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -480,4 +480,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/monitor/job/log.vue

@@ -128,7 +128,7 @@
     />
 
     <!-- 调度日志详细 -->
-    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="调度日志详细" :visible.sync="open" :close-on-click-modal="false" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -293,4 +293,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/monitor/operlog/index.vue

@@ -140,7 +140,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="操作日志详细" :visible.sync="open" :close-on-click-modal="false" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">

src/views/system/config/index.vue

@@ -142,7 +142,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
@@ -353,4 +353,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/dept/index.vue

@@ -56,17 +56,17 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
@@ -83,7 +83,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
@@ -313,4 +313,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/dict/data.vue

@@ -120,7 +120,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
@@ -347,4 +347,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/dict/index.vue

@@ -153,7 +153,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
@@ -357,4 +357,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/menu/index.vue

@@ -62,16 +62,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
@@ -87,7 +87,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
@@ -396,4 +396,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/notice/index.vue

@@ -126,7 +126,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -337,4 +337,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/post/index.vue

@@ -108,7 +108,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,7 +118,7 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />
@@ -319,4 +319,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/role/index.vue

@@ -154,7 +154,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -200,7 +200,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />

src/views/system/user/index.vue

@@ -199,7 +199,7 @@
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -305,7 +305,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" :close-on-click-modal="false" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -662,4 +662,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/user/profile/userAvatar.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body @opened="modalOpened">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper
@@ -164,4 +164,4 @@ export default {
   line-height: 110px;
   border-radius: 50%;
 }
-</style>
+</style>

src/views/tool/gen/index.vue

@@ -157,7 +157,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+    <el-dialog :title="preview.title" :visible.sync="preview.open" :close-on-click-modal="false" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
@@ -317,4 +317,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/warehouseBusiness/inStock/index.vue

@@ -102,9 +102,9 @@
           <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
-      <el-form-item label="箱量" prop="fcntqty">
+      <el-form-item label="箱量" prop="fCntqty">
         <el-input
-          v-model="queryParams.fcntqty"
+          v-model="queryParams.fCntqty"
           placeholder="请输入箱量"
           clearable
           size="small"
@@ -256,7 +256,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改仓库主(出入库)对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="80%" append-to-body>
       <el-form
         style="height: 500px"
         ref="form"
@@ -266,32 +266,51 @@
       >
         <el-row>
           <el-col :span="8">
-            <el-form-item label="货权方" prop="fcorpid">
+            <el-form-item label="制单人" prop="createBy">
+              <el-input disabled v-model="form.createBy" placeholder="制单人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单部门" prop="fDeptid">
               <el-select
-                v-model="form.fCorpid"
+                v-model="form.fDeptid"
                 filterable
-                remote
-                :remote-method="corpsRemoteMethod"
-                placeholder="请选择货权方">
+                disabled
+                remote>
                 <el-option
-                  v-for="dict in fMblnoOptions"
-                  :key="dict.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
+                  v-for="dict in deptOptions"
+                  :key="dict.deptId"
+                  :label="dict.deptName"
+                  :value="dict.deptId"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="仓库" prop="fwarehouseid">
+            <el-form-item disabled label="制单日期" prop="fbilldate">
+              <el-date-picker
+                v-model="form.createTime"
+                style="width: 375px"
+                type="date"
+                disabled
+                value-format="timestamp"
+                placeholder="制单日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="货权方" prop="fcorpid">
               <el-select
-                v-model="form.fWarehouseid"
+                v-model="form.fCorpid"
                 filterable
                 remote
-                :remote-method="warehouseRemoteMethod"
-                placeholder="请选择仓库">
+                :remote-method="corpsRemoteMethod"
+                placeholder="请选择货权方">
                 <el-option
-                  v-for="dict in warehouseOptions"
+                  v-for="dict in fMblnoOptions"
                   :key="dict.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -316,8 +335,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="电话" prop="ftel">
               <el-input v-model="form.fTel" placeholder="请输入电话"/>
@@ -382,8 +399,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="船航次" prop="fvslvoy">
-              <el-input v-model="form.fVslvoy" placeholder="船航次"/>
+            <el-form-item label="船名航次" prop="fvslvoy">
+              <el-input v-model="form.fVslvoy" placeholder="船名航次"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -398,28 +415,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="8">
-            <el-form-item label="贸易方式" prop="ftrademodeid">
-              <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable size="small">
-                <el-option
-                  v-for="dict in fTrademodeidOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+            <el-form-item label="报关单号" prop="fcustomno">
+              <el-input v-model="form.fCustomno" laceholder="报关单号"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计费方式" prop="fbillingway">
-              <el-select v-model="form.fBillingway "
-                         placeholder="请选择计费方式"
-                         clearable
-                         size="small"
-              >
+            <el-form-item label="贸易方式" prop="ftrademodeid">
+              <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable size="small">
                 <el-option
-                  v-for="dict in fFeetunitOptions"
+                  v-for="dict in fTrademodeidOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -428,15 +435,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计费单位" prop="ffeetunit">
+            <el-form-item label="结算方式" prop="fstltypeid">
               <el-select
-                v-model="form.fFeetunit"
-                placeholder="请选择计费单位"
+                v-model="form.fStltypeid"
+                placeholder="请选择结算方式"
                 clearable
                 size="small"
               >
                 <el-option
-                  v-for="dict in fFeetunitOptions"
+                  v-for="dict in fStltypeOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -447,25 +454,50 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="客户存货编号" prop="fbscorpno">
-              <el-input v-model="form.fBscorpno" laceholder="客户存货编号"/>
+            <el-form-item label="仓库" prop="fwarehouseid">
+              <el-select
+                v-model="form.fWarehouseid"
+                filterable
+                remote
+                :remote-method="warehouseRemoteMethod"
+                placeholder="请选择仓库">
+                <el-option
+                  v-for="dict in warehouseOptions"
+                  :key="dict.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="报关单号" prop="fcustomno">
-              <el-input v-model="form.fCustomno" laceholder="报关单号"/>
+            <el-form-item label="仓管员" prop="fstorekeeper">
+              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员"/>
             </el-form-item>
-          </el-col>
+          </el-col><el-col :span="8">
+          <el-form-item label="入库日期" prop="fbsdate">
+            <el-date-picker
+              v-model="form.fBsdate"
+              style="width: 375px"
+              type="date"
+              value-format="timestamp"
+              placeholder="入库日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="结算方式" prop="fstltypeid">
+            <el-form-item label="是否质押" prop="fifpledge">
               <el-select
-                v-model="form.fStltypeid"
-                placeholder="请选择结算方式"
+                v-model="form.fIfpledge"
+                placeholder="请选择是否过磅"
                 clearable
                 size="small"
               >
                 <el-option
-                  v-for="dict in fStltypeOptions"
+                  v-for="dict in fIfpledgeOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -473,6 +505,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="银行名称" prop="fbankcorpid">
+              <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="经营单位" prop="fsbu">
+              <el-select
+                v-model="form.fSbu"
+                filterable
+                remote
+                :remote-method="fSbuRemoteMethod"
+                placeholder="请选择经营单位">
+                <el-option
+                  v-for="dict in fSbuOptions"
+                  :key="dict.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -510,34 +564,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="经营单位" prop="fsbu">
-              <el-select
-                v-model="form.fSbu"
-                filterable
-                remote
-                :remote-method="fSbuRemoteMethod"
-                placeholder="请选择经营单位">
-                <el-option
-                  v-for="dict in fSbuOptions"
-                  :key="dict.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
+            <el-form-item label="客户存货编号" prop="fbscorpno">
+              <el-input v-model="form.fBscorpno" laceholder="客户存货编号"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="是否质押" prop="fifpledge">
-              <el-select
-                v-model="form.fIfpledge"
-                placeholder="请选择是否过磅"
-                clearable
-                size="small"
+            <el-form-item label="计费方式" prop="fbillingway">
+              <el-select v-model="form.fBillingway "
+                         placeholder="请选择计费方式"
+                         clearable
+                         size="small"
               >
                 <el-option
-                  v-for="dict in fIfpledgeOptions"
+                  v-for="dict in fFeetunitOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -593,7 +634,7 @@
           prop="fgoodsid"
           header-align="center"
           align="center"
-          label="品牌"
+          label="品名"
         >
           <template slot-scope="scope">
             <el-select
@@ -601,7 +642,7 @@
               filterable
               remote
               :remote-method="goodsRemoteMethod"
-              placeholder="请选择品牌">
+              placeholder="请选择品名">
               <el-option
                 v-for="dict in goodsOptions"
                 :key="dict.fId"
@@ -627,7 +668,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fcntqty"
+          prop="fCntqty"
           header-align="center"
           align="center"
           label="箱量"
@@ -645,13 +686,28 @@
           prop="fplangrossweight"
           header-align="center"
           align="center"
-          label="重量"
+          label="计划毛重"
         >
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fPlangrossweight"
-              placeholder="重量"
+              placeholder="计划毛重"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fplannetweight"
+          header-align="center"
+          align="center"
+          label="计划净重"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g,'')"
+              v-model="scope.row.fplannetweight"
+              placeholder="计划净重"
               show-word-limit
             />
           </template>
@@ -690,13 +746,28 @@
           prop="fgrossweight"
           header-align="center"
           align="center"
-          label="入库重量"
+          label="入库毛重"
         >
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fGrossweight"
-              placeholder="入库重量"
+              placeholder="入库毛重"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fnetweight"
+          header-align="center"
+          align="center"
+          label="入库净重"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g,'')"
+              v-model="scope.row.fNetweight"
+              placeholder="入库净重"
               show-word-limit
             />
           </template>
@@ -768,7 +839,6 @@
         >
           <template slot-scope="scope">
             <el-input
-              disabled
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fGoodsval"
               placeholder="货值"
@@ -1092,6 +1162,21 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="remarks"
+          header-align="center"
+          align="center"
+          label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.remarks"
+              :disabled="browseStatus"
+              placeholder="备注"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
           header-align="center"
           align="center"
           label="操作"
@@ -1253,6 +1338,21 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="remarks"
+          header-align="center"
+          align="center"
+          label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.remarks"
+              :disabled="browseStatus"
+              placeholder="备注"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
           header-align="center"
           align="center"
           label="操作"
@@ -1633,7 +1733,7 @@
         this.reset();
         this.queryUser()
         this.open = true;
-        this.title = "添加仓库主(出入库)";
+        this.title = "入库单";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -1678,7 +1778,6 @@
             this.warehouseOptions = []
             this.warehouseOptions.push(response.data.warehouse)
           }
-          console.log(JSON.stringify(response.data.warehouseBillsItem))
           if (typeof response.data.warehouseBillsItem !== 'undefined' && response.data.warehouseBillsItem !== null) {
             this.dataList = response.data.warehouseBillsItem
             if (response.data.goodsList !== null) {

src/views/warehouseBusiness/outStock/index.vue

@@ -370,7 +370,7 @@ RK CK DB HZ
     />
 
     <!-- 添加或修改仓库主(出入库)对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。

src/views/warehouseBusiness/warehousebills/index.vue

@@ -684,7 +684,7 @@ RK CK DB HZ
     />
 
     <!-- 添加或修改仓库主(出入库)对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。

src/views/warehouseBusiness/warehousebillsfees/index.vue

@@ -251,7 +251,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -261,7 +261,7 @@
     />
 
     <!-- 添加或修改仓库费用明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="对应主表id" prop="fPid">
           <el-input v-model="form.fPid" placeholder="请输入对应主表id" />

src/views/warehouseBusiness/warehousebillsitems/index.vue

@@ -249,7 +249,7 @@
     />
 
     <!-- 添加或修改仓库明细从表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="PID,对应主表id" prop="fPid">
           <el-input v-model="form.fPid" placeholder="请输入PID,对应主表id" />

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.112:9010`,
-        // target: `http://engineering.echepei.com:9010/`,
+        // target: `http://192.168.137.112:9010`,
+        target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''