12/19 药品发票登记1.0

src/views/inout/InvoiceCkeck.vue

@@ -501,7 +501,8 @@ 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].amount
+        mount += this.invoiceRow[i].price
       }
       if (mount != this.inputQuery.price) {
         this.$confirm("价格不匹配，是否确定提交?", "提示", {

src/views/pharmaceuticals/inout/InvoiceCkeck.vue

@@ -155,99 +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"
       style="z-index: 9999"
@@ -306,7 +213,7 @@ export default {
   data() {
     return {
       idList: [],
-      invoiceRow: [],
+      // invoiceRow: [],
       statusCode: null,
       choiceFile: "选取文件",
       fileList: [],
@@ -482,10 +389,10 @@ export default {
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
   methods: {
     onSubmit() {
-      if (this.invoiceRow == null|| this.invoiceRow.length === 0) {
+      // if (this.invoiceRow == null|| this.invoiceRow.length === 0) {
-        this.$message.error("请选择要登记的药品! ");
+      //   this.$message.error("请选择要登记的药品! ");
-        return false;
+      //   return false;
-      }
+      // }
       if (this.$isBlank(this.inputQuery.invoiceEncode)) {
         this.$message.error("发票编码不能为空！");
         return;
@@ -501,7 +408,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("价格不匹配，是否确定提交?", "提示", {
@@ -537,7 +444,10 @@ export default {
         });
 
       // 加状态
-      updateorderBiz(this.inputQuery.list).then((res) => {
+      let query = {
+        list : this.inputQuery.list
+      }
+      updateorderBiz(query).then((res) => {
         this.closeDialog();
       });
     },

src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue

@@ -795,11 +795,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>
 
@@ -1062,6 +1064,7 @@ export default {
       acceptQuery: null,
       acceptOrderVisible: false,
       subRow: null,
+      detaillist:[],
     };
   },
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@@ -1091,11 +1094,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;