dev

src/components/inventory/apply/DetailApply.vue

@@ -216,7 +216,6 @@ const getUserInfo = () => {
 const detail = (id: any) => {
   isShow.value = true
   post("inventory/apply/getApplyDetail", {id}).then((res: any) => {
-    formData.value = res.useInfo;
     tableList.value = JSON.parse(res);
   })
 }

src/components/inventory/goods/Search.vue

@@ -18,8 +18,8 @@
                       highlight-current-row @current-change="change_current_search_data_index"
                       :row-class-name="tableRowClassName">
               <el-table-column prop="name" label="名称" fixed width="180" show-overflow-tooltip/>
-              <el-table-column prop="json.approval_number" fixed label="国药准字" width="180" show-overflow-tooltip/>
-              <el-table-column prop="producer" label="生产企业" width="180" show-overflow-tooltip/>
+              <el-table-column :prop="type==1306?'json.reg_number' : 'json.approval_number'" fixed label="国药准字" width="180" v-if="type==1301 || type==1306" show-overflow-tooltip/>
+              <el-table-column prop="producer" label="生产企业" width="180" v-if="type==1301 || type==1306" show-overflow-tooltip/>
               <el-table-column v-if="type==1301" prop="json.reg_specifications" label="注册规格" width="80"
                                show-overflow-tooltip/>
               <el-table-column v-if="type==1301" prop="json.min_packaging_unit" label="包装单位" width="80"
@@ -88,6 +88,10 @@ const init = (_type: number, _name: string) => {
   type.value = _type;
   keyword.value = _name;
   show.value = true;
+  if (keyword.value && keyword.value != ""){
+    search_social()
+  }
+
 };
 defineExpose({init});
 

src/components/inventory/purchase/AddOrder.vue

@@ -277,7 +277,14 @@ let confirm = async () => {
       ElMessage.error('请至少添加一个采购药品')
       return
     }
-
+    //生产批号
+    for (let i = 0; i < table_list.value.length; i++) {
+      debugger
+      if (!table_list.value[i].productionBatchCode) {
+        ElMessage.error('生产批号不能为空')
+        return
+      }
+    }
     // 检查每个药品的有效期
     for (let i = 0; i < table_list.value.length; i++) {
       if (!checkProductionDate(table_list.value[i])) {

src/views/social/accountRecords.vue

@@ -68,10 +68,12 @@ const detailsDo = (row: any) => {
   let data = {...row};
   data.beginTime = selectDate.value[0];
   data.endTime = selectDate.value[1];
-  // post("social/reconciliation/detailDo", {data: data})
-  post("social/reconciliation/testDetailDo", {data: data}).then((res: any) => {
+  post("social/reconciliation/detailDo", {data: data}).then((res: any) => {
     openDetailList(res)
   })
+  // post("social/reconciliation/testDetailDo", {data: data}).then((res: any) => {
+  //   openDetailList(res)
+  // })
 }
 
 const detailListRef = ref();