Merge remote-tracking branch 'origin/fengcang' into fengcang

src/views/basic/BasicEntrutsRece.vue

@@ -26,8 +26,9 @@
                 <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
                 <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
                 <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
-                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed>
-                </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
+                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
+                <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
                 <el-table-column label="委托验收人" prop="employeeName" fixed>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right">

src/views/basic/BasicEntrutsReceModify.vue

@@ -306,6 +306,7 @@ export default {
         invChange() {
 
             this.findSubInvByInv();
+            this.inputQuery.invWarehouseCode = null;
             this.$set(this.inputQuery, "entrustUser", "");
             this.$set(this.inputQuery, "entrustInv", "");
             this.getEntrustStorage();

src/views/basic/invWarehouse.vue

@@ -181,6 +181,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicInv"
                             @click.native.stop="handleSubDel(scope.row)"
                         >删除
                         </el-button
@@ -214,14 +215,6 @@
                         label="用户名"
                         min-width="30%">
                     </el-table-column>
-                    <el-table-column
-                        prop="isDirector"
-                        label="主管"
-                        min-width="30%">
-                        <template slot-scope="scope">
-                            <span>{{ isDirectorMap[scope.row.director] }}</span>
-                        </template>
-                    </el-table-column>
                     <el-table-column
                         label="操作"
                         min-width="30%"
@@ -679,10 +672,6 @@ export default {
                 true: "寄售",
                 false: "仓库",
             },
-            isDirectorMap: {
-                true: "是",
-                false: "否",
-            },
             directorMap: {
                 true: "取消主管",
                 false: "设为主管",

src/views/business/stockOrderEditor.vue

@@ -93,7 +93,7 @@
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="单据日期" prop="billdate" width="150"></el-table-column>
                 <el-table-column label="单据状态">
                     <template slot-scope="scope">
                         {{ scope.row.status | statusFilterName }}

src/views/business/stockOrderNew.vue

@@ -996,4 +996,11 @@ export default {
 
 <style scoped>
 
+/**
+解决el-input输入框 type=number时，输入中文光标上移问题
+ */
+.el-input__inner{
+    line-height: 1px !important;
+}
+
 </style>

src/views/userManage/admin/authAdmin.vue

@@ -86,6 +86,7 @@
       :before-close="hideForm"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      v-if="formVisible"
       width="70%"
       top="5vh"
     >