Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/basic/product/product.vue

@@ -1717,35 +1717,35 @@
 <!--              </el-button>-->
 <!--            </div>-->
           </el-dialog>
-          <el-dialog
+          <!--<el-dialog-->
-            title="耗材字典-编辑"
+          <!--  title="耗材字典-编辑"-->
-            :visible.sync="editSingleDiDialogVisible"
+          <!--  :visible.sync="editSingleDiDialogVisible"-->
-            :close-on-click-modal="false"
+          <!--  :close-on-click-modal="false"-->
-            :close-on-press-escape="false"
+          <!--  :close-on-press-escape="false"-->
-            width="45%"
+          <!--  width="45%"-->
-            v-if="editSingleDiDialogVisible"
+          <!--  v-if="editSingleDiDialogVisible"-->
-          >
+          <!--&gt;-->
-            <product-single-edit
+          <!--  <product-single-edit-->
-              :editQuery="editSingleFormat"
+          <!--    :editQuery="editSingleFormat"-->
-            ></product-single-edit>
+          <!--  ></product-single-edit>-->
-
+
-            <div style="text-align: center; margin-top: 12px">
+          <!--  <div style="text-align: center; margin-top: 12px">-->
-              <el-button
+          <!--    <el-button-->
-                type="primary"
+          <!--      type="primary"-->
-                size="small"
+          <!--      size="small"-->
-                icon="search"
+          <!--      icon="search"-->
-                @click="onAddSingleSubmit(false)"
+          <!--      @click="onAddSingleSubmit(false)"-->
-              >提交
+          <!--    >提交-->
-              </el-button>
+          <!--    </el-button>-->
-              <el-button
+          <!--    <el-button-->
-                type="primary"
+          <!--      type="primary"-->
-                size="small"
+          <!--      size="small"-->
-                icon="search"
+          <!--      icon="search"-->
-                @click="cancelDialog"
+          <!--      @click="cancelDialog"-->
-              >取消
+          <!--    >取消-->
-              </el-button>
+          <!--    </el-button>-->
-            </div>
+          <!--  </div>-->
-          </el-dialog>
+          <!--</el-dialog>-->
           <el-dialog
             title="耗材字典-关联添加器械信息"
             :visible.sync="selectUdiDialogVisible"

src/views/basic/product/productEdit.vue

@@ -1318,12 +1318,12 @@ export default {
         this.editQuery.distributeLevelUnit = matchingItem.packUnit;
         this.editQuery.distributeLevel = matchingItem.packLevel
       }
-      calculateDistCount(matchingItem).then((res) => {
+      // calculateDistCount(matchingItem).then((res) => {
-        this.editQuery = {
+      //   this.editQuery = {
-          ...this.editQuery,
+      //     ...this.editQuery,
-          distributeLevelCount: res.data.distributeLevelCount,
+      //     distributeLevelCount: res.data.distributeLevelCount,
-        }
+      //   }
-      })
+      // })
     },
     useLevelDiChange(val) {
       const matchingItem = this.detailList.find(item => item.nameCode == val);
@@ -1331,12 +1331,12 @@ export default {
         this.editQuery.useLevelUnit = matchingItem.packUnit;
         this.editQuery.useLevel = matchingItem.packLevel;
       }
-      calculateUseCount(matchingItem).then((res) => {
+      // calculateUseCount(matchingItem).then((res) => {
-        this.editQuery = {
+      //   this.editQuery = {
-          ...this.editQuery,
+      //     ...this.editQuery,
-          useLeverCount: res.data.useLeverCount,
+      //     useLeverCount: res.data.useLeverCount,
-        }
+      //   }
-      })
+      // })
     },
     classifyChange() {
       this.classifyChange(this.editQuery.flbm)
@@ -1751,11 +1751,12 @@ export default {
 
           //如果都为空 进行补充
           if (!this.$isNotBlank(this.editQuery.sptm) && !this.$isNotBlank(this.editQuery.ybbm)) {
-            getCodeRelDetail({drugcode:row.nameCode}).then((response) => {
+            getCodeRelDetail({drugCode:row.nameCode}).then((response) => {
               if (response.code == 20000) {
-                if (this.response.data != null && this.response.data.length > 0) {
+                if (response.data != null && response.data.length > 0) {
-                  this.editQuery.sptm = this.response.data[0].sptm;
+                  this.editQuery.sptm = response.data[0].sptm;
-                  this.editQuery.ybbm = this.response.data[0].ybbm;
+                  this.editQuery.ybbm = response.data[0].ybbm;
+                  this.getYbHcData()
                 }
               }
             }).catch(() => {

src/views/collect/prescribe/prescribeDownloadDialog.vue

@@ -431,7 +431,11 @@ export default {
         this.loading = false
         if (res.code == 20000){
           this.list = res.data.list || []
-          this.total = res.data.total || 0
+          if (res.data.list.length === 0){
+            this.total = 0
+          }else
+            this.total = res.data.total
+
         }else {
           this.$message.error(res.message)
         }

src/views/inventory/InvProducts.vue

@@ -488,7 +488,7 @@ export default {
         ylqxzcrbarmc: null,
         page: 1,
         limit: 10,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
       };
       this.getList();
       this.findMethod(this);

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -116,7 +116,7 @@
           <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true" width="140"></el-table-column>
           <el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true" width="110"></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true" width="140"></el-table-column>
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="80"></el-table-column>
+          <el-table-column label="计量单位" prop="packUnit" show-overflow-tooltip="true" width="80"></el-table-column>
           <el-table-column width="110" label="申购数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -696,6 +696,7 @@ export default {
       this.orderEditor = false;
     }
     this.findSubInvs();
+    this.findMethod("")
     this.codeArray = [];
   },
 };