Merge branch 'fencang' into busUser

# Conflicts:
#	public/config.json
#	src/views/basic/basicCompanyProducts.vue

src/views/basic/BussinessType.vue

@@ -193,6 +193,7 @@ export default {
                 checkPc: null,
                 checkWebNew: null,
                 checkChange: null,
+                checkCopy: null,
                 secCheckUdims: null,
                 secCheckPdaEd: null,
                 secCheckPdaUn: null,
@@ -201,6 +202,7 @@ export default {
                 secCheckChange: null,
                 checkBalacne: null,
                 secCheckBalacne: null,
+                secCheckCopy: null,
                 corpType: null,
                 storageCode: null,
                 supplementOrderType: null,
@@ -371,6 +373,8 @@ export default {
                 defaultSubInv: row.defaultSubInv,
                 defaultInv: row.defaultInv,
                 orderVisibleType: row.orderVisibleType,
+                checkCopy: row.checkCopy,
+                secCheckCopy: row.secCheckCopy,
             };
             this.modifyDialogVisible = true;
         },

src/views/basic/BussinessTypeModify.vue

@@ -293,6 +293,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkCopy" :disabled="!inputQuery.checkEnable">手动补单
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
 
         <el-divider></el-divider>
@@ -352,6 +358,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckCopy" :disabled="!inputQuery.secCheckEnable">手动补单
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
         <el-divider></el-divider>
 
@@ -375,7 +387,7 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 export default {
-    name: "inputQuery",
+    name: "BussinessTypeModify",
     props: {
         inputQuery: {
             type: Object,

src/views/basic/basicCompanyProducts.vue

@@ -734,19 +734,20 @@
                                     <el-checkbox v-model="checked" :disabled="!isUseDyCheck"
                                     >以使用单元数量入库
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isDisable"
+                                    <el-checkbox v-model="editQuery.isDisable" disabled
                                     >是否禁用
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isAdavence"
+                                    <el-checkbox v-model="editQuery.isAdavence" disabled
                                     >是否寄售
                                     </el-checkbox>
                                     <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                                                 disabled
                                     >允许无批次号
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                                    <el-checkbox v-model="editQuery.allowNoExpire" class="" disabled
                                     >允许无失效日期
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                                    <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
                                     >允许无生产日期
                                     </el-checkbox>
                                 </div>
@@ -1340,7 +1341,7 @@
                 ></selectErp>
             </el-dialog>
             <el-dialog
-                title="拆分产品"
+                title="选入DI器械信息"
                 :visible.sync="selectLocalVisible"
                 width="85%"
                 :close-on-click-modal="false"