入库修改

src/views/basicdata/dept/index.vue

@@ -57,16 +57,16 @@
       <el-table-column prop="fAddr" label="地址" width="100"></el-table-column>
       <el-table-column prop="fContacts" label="联系人" width="100"></el-table-column>
       <el-table-column prop="fTel" label="电话" width="150"></el-table-column>
-      <el-table-column prop="fCharg" label="计费" width="100">
+      <el-table-column prop="fCharg" label="计费" width="50">
         <template slot-scope="scope">
           <span v-if="scope.row.fCharg === 0">否</span>
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="80"></el-table-column>
-      <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="100"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column prop="remark" label="备注" width="100"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="50"></el-table-column>
+      <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="50"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/warehouseBusiness/inStock/index.vue

@@ -3867,7 +3867,7 @@ export default {
       // this.queryParams.fLineno = this.form.fCorpid;
       let data = {}
       let fTaskType = kye
-      if (kye == 1){
+      if (kye == 2){
         this.Navigation = true
         data = {
           pageNum:1,
@@ -3875,7 +3875,7 @@ export default {
           fTaskType:Number(fTaskType),
           fLabour:this.form.fLabour
         }
-      }else if (kye == 2) {
+      }else if (kye == 1) {
         this.Navigation = true
         data = {
           pageNum:1,