12/20 药品发票基础显示包装比例

4 months ago · 63f6a01374
parent 327a69e3e2
commit 63f6a01374
5 changed files with 37 additions and 106 deletions
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@ -79,6 +79,13 @@
                ></el-input>
              </template>
            </el-table-column>
+            <el-table-column label="包装比例" prop="packRatio" show-overflow-tooltip width="120">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.packRatio" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
            <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="120">
              <template slot-scope="scope">
                <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
@ -262,7 +269,7 @@
                  <el-option label="中药注射剂" :value="7"></el-option>
                  <el-option label="疫苗" :value="8"></el-option>
                  <el-option label="血液制品" :value="9"></el-option>
-                  <el-option label="国家基本药品目录入网药品" :value="10"></el-option>
+                  <el-option label="国家基本药品目录入网药品" :value="10" v-if="!isSpecial"></el-option>
                  <el-option label="非基本药物" :value="11"></el-option>
                  <el-option label="各省增补基本药物" :value="12"></el-option>
                  <el-option label="特殊药品复方制剂" :value="13"></el-option>
@ -830,6 +837,7 @@ export default {
          productId: null,
          nameCode: '',
          packLevel: null,
+          packRatio: null,
          bhxjsl: null,
          isDisabled: false,
          isUpDisabled: true,
@ -849,7 +857,8 @@ export default {
      levelUnitList: [],
      maxLevel: 1,

-      editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
+      editRowSwitch: false, //产品标识编辑开关 没保存前其他编辑不能按
+      isSpecial:false
    }

  },
@ -1061,7 +1070,8 @@ export default {
        uuid: this.newProductData.uuid,
        productId: row.productId,
        diType: row.diType,
-        xjdw: row.xjdw
+        xjdw: row.xjdw,
+        packRatio: row.packRatio
      }
      updateLevelDrug(editQuery).then(res => {
        this.saveLoading = false
@ -1150,6 +1160,7 @@ export default {
          .then((response) => {
            this.loading = false
            this.detailList = response.data || []
+            this.checkIsSpecial()
          })
          .catch(() => {
            this.loading = false
@ -1157,7 +1168,15 @@ export default {
          })
      }
    },
-
+    checkIsSpecial(){
+      if (this.detailList.length > 0){
+        this.detailList.forEach(item => {
+          if (item.nameCode.startsWith('89')) {
+            this.isSpecial = true
+          }
+        })
+      }
+    },
    distributeLevelDiChange(val) {
      const matchingItem = this.detailList.find(item => item.nameCode == val)
      if (matchingItem) {
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@ -163,6 +163,7 @@
            <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
            <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
+            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>
            <el-table-column label="批次号" prop="batchNo"></el-table-column>
            <el-table-column label="生产日期" prop="productDate"></el-table-column>
            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@ -504,7 +504,7 @@ export default {
      this.inputQuery.list = this.invoiceRow;
      let mount = 0;
      for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].amount
+        mount += this.invoiceRow[i].price
      }
      if (mount != this.inputQuery.price) {
        this.$confirm("价格不匹配，是否确定提交?", "提示", {
--- a/src/views/inoutDrug/InvoiceCkeck.vue
+++ b/src/views/inoutDrug/InvoiceCkeck.vue
@ -155,100 +155,6 @@
      </el-card>
    </el-form>

-    <el-tabs type="border-card" style="margin: 15px">
-      <!--单据业务详情-->
-      <el-tab-pane>
-        <span slot="label">单据 {{ input.billNo }}-单据详情</span>
-        <el-table
-          v-loading="bizDetailLoading"
-          :data="codeDetailList"
-          style="width: 100%"
-          border
-          @current-change="BizDetailInv"
-          @selection-change="handleSelectionUdiChange"
-          row-key="id"
-          highlight-current-row
-        >
-          <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="发票代码"
-            prop="invoiceCodes"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="药品名称"
-            prop="coName"
-            width="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="包装规格"
-            width="150"
-            prop="spec"
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            width="100"
-            prop="batchNo"
-          ></el-table-column>
-          <el-table-column
-            label="数量"
-            prop="count"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="reCount"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="价格"
-            prop="price"
-            width="100"
-          ></el-table-column>
-
-          <el-table-column
-            label="金额"
-            prop="amount"
-            width="100"
-          ></el-table-column>
-
-          <el-table-column
-            label="生产日期"
-            prop="productDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column width="100" label="计量单位" prop="measname">
-          </el-table-column>
-          <el-table-column
-            label="生产企业"
-            prop="manufacturer"
-            width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="批准文号"
-            width="160"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
-
-        </el-table>
-        <pagination
-          v-show="codeTotal > 0"
-          :total="codeTotal"
-          :page.sync="codeQuery.page"
-          :limit.sync="codeQuery.limit"
-          @pagination="getCodeDetailLists"
-        />
-      </el-tab-pane>
-    </el-tabs>

    <el-image-viewer
      v-if="imgViewerVisible"
@ -308,7 +214,7 @@ export default {
    return {
      check: false,
      idList: [],
-      invoiceRow: [],
+      // invoiceRow: [],
      statusCode: null,
      choiceFile: "选取文件",
      fileList: [],
@ -485,10 +391,10 @@ export default {
  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
  methods: {
    onSubmit() {
-      if (this.invoiceRow == null || this.invoiceRow.length == 0) {
-        this.$message.error("请选择要登记的物资! ");
-        return false;
-      }
+      // if (this.invoiceRow == null || this.invoiceRow.length == 0) {
+      //   this.$message.error("请选择要登记的物资! ");
+      //   return false;
+      // }
      if (this.$isBlank(this.inputQuery.invoiceEncode)) {
        this.$message.error("发票编码不能为空！");
        return;
@ -504,7 +410,7 @@ export default {
      this.inputQuery.list = this.invoiceRow;
      let mount = 0;
      for (var i = 0; i < this.invoiceRow.length; i++) {
-        mount += this.invoiceRow[i].amount
+        mount += this.invoiceRow[i].price
      }
      if (mount != this.inputQuery.price) {
        this.$confirm("价格不匹配，是否确定提交?", "提示", {
--- a/src/views/inoutDrug/InvoiceRegByOrder.vue
+++ b/src/views/inoutDrug/InvoiceRegByOrder.vue
@ -437,11 +437,13 @@
      :close-on-click-modal="false"
      :close-on-press-escape="false"
      v-if="checkInvoice"
+      @close="closecheckInvoice"
    >
      <checkInvoice
        :closeDialog="closecheckInvoice"
        :input="inputInv"
        :getOrderDetails="getOrderDetails"
+        :invoiceRow="detaillist"
      ></checkInvoice>
    </el-dialog>

@ -708,6 +710,7 @@ export default {
      acceptQuery: null,
      acceptOrderVisible: false,
      subRow: null,
+      detaillist:[],
    };
  },
  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@ -737,11 +740,13 @@ export default {
      this.getList();
    },
    InvoiceRegister1(_this,row) {
-      _this.savebillno = row.billNo
+      _this.savebillno = _this.currentRow.billNo
      _this.inputInv = row;
+      _this.detaillist.push(row)
      _this.checkInvoice = true;
    },
    closecheckInvoice() {
+      this.detaillist = []
      this.checkInvoice = false;
      this.getList();
      this.currentRow.billNo = this.savebillno;