库存产品详情，内部码分页打印

2 years ago · 7cb8f7407e
parent 25761cf156
commit 7cb8f7407e
7 changed files with 40 additions and 9 deletions
--- a/.env.production
+++ b/.env.production
@ -15,19 +15,27 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'

 # 平潭
-# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'

 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'

 # 刘恩典
-VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'

 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'

+# 平和
+# VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
+

 # 应用访问路径 例如使用前缀 /admin/
+
+# 域名
+# VUE_APP_CONTEXT_PATH = '/'
+
+# 其他
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

 # 监控地址
--- a/src/views/basic/business/stockOrderQRCodeDetail.vue
+++ b/src/views/basic/business/stockOrderQRCodeDetail.vue
@ -57,7 +57,8 @@
        <!--        </el-table-column>-->
        <el-table-column label="标签数量" width="120">
          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 100%"
+                      type="number"
                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
            <!--                            <span>{{ scope.row.reCount }}</span>-->
          </template>
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@ -41,6 +41,7 @@
        </el-table-column>
        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
        <el-table-column label="入库数量" prop="inCount"></el-table-column>
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@ -150,6 +150,7 @@ export default {
        batchNo: null,
        deptCode: null,
        invCode: null,
+        price: null,
        page: 1,
        limit: 10
      },
@ -166,8 +167,14 @@ export default {
      });
      this.invPreProductDetailQuery = {
        code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
        page: 1,
-        limit: 10
+        limit: 10,
+        price: null,
      };
      this.getList();
    },
@ -204,7 +211,7 @@ export default {
      this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
      this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
      this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
-      this.invProductDetailQuery.price = this.inputQuery.price;
+      this.invPreProductDetailQuery.price = this.inputQuery.price;
      // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
      getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {
        this.loading = false;
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@ -150,6 +150,7 @@ export default {
        batchNo: null,
        deptCode: null,
        invCode: null,
+        price:null,
        page: 1,
        limit: 10
      },
@ -166,6 +167,12 @@ export default {
      });
      this.invPreProductDetailQuery = {
        code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        price:null,
        page: 1,
        limit: 10
      };
@ -204,7 +211,7 @@ export default {
      this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
      this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
      this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
-      this.invProductDetailQuery.price = this.inputQuery.price;
+      this.invPreProductDetailQuery.price = this.inputQuery.price;
      // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
      getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
        this.loading = false;
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@ -147,6 +147,7 @@ export default {
        batchNo: null,
        deptCode: null,
        invCode: null,
+        price: null,
        page: 1,
        limit: 10
      },
@ -162,6 +163,12 @@ export default {
        path: "",
      });
      this.invProductDetailQuery = {
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        price: null,
        code: null,
        page: 1,
        limit: 10
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@ -61,7 +61,7 @@
        </el-table-column>
        <el-table-column label="标签数量">
          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 100%"
                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
            <!--                            <span>{{ scope.row.reCount }}</span>-->
          </template>