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

src/views/business/DialogcChangeNewOrder.vue

@@ -285,6 +285,14 @@ export default {
                 this.$message.error('当前往来单位不能为空');
                 return;
             }
+            if (this.$isBlank(this.formData.invWarehouseCode)) {
+                this.$message.error("当前分库不能为空");
+                return;
+            }
+            if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromSubInvCode)) {
+                this.$message.error('往来单位分库不能为空');
+                return;
+            }
             if (this.detailList.length == 0) {
                 this.$message.error("产品列表不能为空");
                 return;

src/views/business/stockOrderDelSearch.vue

@@ -102,17 +102,8 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->

src/views/business/stockOrderSearch.vue

@@ -102,16 +102,8 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button

src/views/inout/IONewOrder.vue

@@ -523,12 +523,16 @@ export default {
             // this.filterQuery.statusOrOne = -1;
             filterOrder(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
+                    if (response.code === 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
-                .catch(() => {
+                .catch((error) => {
+                    this.$message.error(error.message)
                     this.loading = false;
                     this.list = [];
                     this.total = 0;