目录记录必填项修改

package.json

@@ -28,7 +28,7 @@
     "js-sha1": "^0.6.0",
     "md5": "^2.3.0",
     "module": "^1.2.5",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/views/page/consumCataManage-sup/catalogdetails.vue

@@ -76,7 +76,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="生产企业" prop="prodEntp">
+                <el-form-item label="生产企业" prop="prodEntp" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.prodEntp }}
                   </div>
@@ -89,7 +89,7 @@
                 </el-form-item>
               </div>
               <div class="flex-css">
-                <el-form-item label="代理企业" prop="agnt">
+                <el-form-item label="代理企业" prop="agnt" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.agnt }}
                   </div>
@@ -110,7 +110,7 @@
                   ></el-input>
                 </el-form-item>
 
-                <el-form-item label="规格" prop="spec">
+                <el-form-item label="规格" prop="spec" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.spec }}
                   </div>
@@ -122,7 +122,7 @@
                 </el-form-item>
               </div>
               <div class="flex-css">
-                <el-form-item label="型号" prop="mol">
+                <el-form-item label="型号" prop="mol" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.mol }}
                   </div>
@@ -132,7 +132,7 @@
                     placeholder="请输入型号"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="材质" prop="matl">
+                <el-form-item label="材质" prop="matl" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.matl }}
                   </div>
@@ -142,7 +142,7 @@
                     placeholder="请输入材质"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="包装材质" prop="pacmatl">
+                <el-form-item label="包装材质" prop="pacmatl" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.pacmatl }}
                   </div>
@@ -154,7 +154,7 @@
                 </el-form-item>
               </div>
               <div class="flex-css">
-                <el-form-item label="注册证号" prop="regcertno">
+                <el-form-item label="注册证号" prop="regcertno" :rules="rules.required">
                   <div class="content" v-if="isShow">
                     {{ infoData.regcertno }}
                   </div>
@@ -223,7 +223,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="是否集采" prop="isFas">
+                <el-form-item label="是否集采" prop="isFas" :rules="rules.selectRequired">
                   <div class="content" v-if="isShow">
                     <span v-if="infoData.isFas == '1'">是</span>
                     <span v-if="infoData.isFas == '0'">否</span>
@@ -249,6 +249,7 @@
                   label="集采批次"
                   prop="fasBtch"
                   v-if="infoData.isFas == '1'"
+                  :rules="rules.required"
                 >
                   <div class="content" v-if="isShow">
                     {{ infoData.fasBtch }}
@@ -294,7 +295,7 @@
             <h3>耗材编码资料</h3>
             <div class="form-body">
               <div class="flex-css">
-                <el-form-item label="医保编码" prop="hiCode">
+                <el-form-item label="医保编码" prop="hiCode" :rules="rules.required">
                   <div class="content" v-if="editCode">
                     {{ infoData.hiCode }}
                   </div>

src/views/page/consumCataManage-sup/distributionmanage.vue

@@ -651,7 +651,8 @@ export default {
       // tree
       activeNametree: "org",
       btnShow: false,
-      list1:[]
+      list1:[],
+      routespdId:"",
     };
   },
   methods: {
@@ -893,10 +894,14 @@ export default {
     },
     // 对码弹窗获取供应商列表
     handleDui(row) {
-      // console.log(row, "编辑");
+      if (this.spdId) {
+        this.routespdId = this.spdId;
+      } else {
+        this.routespdId = this.$route.query.spdId;
+      }
       this.$router.push({
         name: "catalogdetails",
-        query: { id: row.id, status: row.status, spdId: this.spdId, isPub: row.isPub,type:"modify",page:"1" ,current:this.listQuery.current,opeType:"修改" },
+        query: { id: row.id, status: row.status, spdId: this.routespdId, isPub: row.isPub,type:"modify",page:"1" ,current:this.listQuery.current,opeType:"修改" },
       });
       // this.dialogDui = true;
       // this.consumableData = [];

src/views/page/consumCataManage-sup/index.vue

@@ -579,6 +579,7 @@ export default {
       // tree
       activeNametree: "org",
       btnShow: false,
+      routespdId:"",
     };
   },
   methods: {
@@ -826,40 +827,19 @@ export default {
     },
     // 对码弹窗获取供应商列表
     handleDui(row) {
-      // console.log(row, "编辑");
+      if (this.spdId) {
+        this.routespdId = this.spdId;
+      } else {
+        this.routespdId = this.$route.query.spdId;
+      }
+      console.log(this.routespdId, "编辑");
       this.$router.push({
         name: "catalogdetails",
-        query: { id: row.id, status: row.status, spdId: this.spdId, isPub: row.isPub,opeType:row.opeType,type:"edit",current:this.listQuery.current,page:"2" },
+        query: { id: row.id, status: row.status,
+          spdId: this.routespdId, isPub: row.isPub,
+          opeType:row.opeType,type:"edit",
+          current:this.listQuery.current,page:"2" },
       });
-      // Vue.use(sessionStorage);
-      // sessionStorage.setItem("spdId",this.listQuery.spdId);
-      // sessionStorage.setItem("current",this.listQuery.current);
-      // sessionStorage.setItem("current",this.listQuery.size);
-      // sessionStorage.setItem("current",this.listQuery.spec);
-      // sessionStorage.setItem("current",this.listQuery.hiCode);
-      // sessionStorage.setItem("current",this.listQuery.isFas);
-      // sessionStorage.setItem("current",this.listQuery.mol);
-      // sessionStorage.setItem("current",this.listQuery.prodSouc);
-      // sessionStorage.setItem("current",this.listQuery.mcsType);
-      // sessionStorage.setItem("current",this.listQuery.matl);
-      // sessionStorage.setItem("current",this.listQuery.prodEntp);
-      // sessionStorage.setItem("current",this.listQuery.prodName);
-      // sessionStorage.setItem("current",this.listQuery.status);
-      // sessionStorage.setItem("current",this.listQuery.regcertno);
-      // sessionStorage.setItem("current",this.listQuery.isPub);
-      // this.dialogDui = true;
-      // this.consumableData = [];
-      // this.consumableData.push(row);
-      // this.supLoading = true;
-      // QuerySplerDrugList({ spdId: row.spdId })
-      //   .then((res) => {
-      //     this.form.splerData = res.data.records;
-      //     this.total = res.data.total;
-      //     this.supLoading = false;
-      //   })
-      //   .catch((err) => {
-      //     this.supLoading = false;
-      //   });
     },
     // 对码操作
     handleClick(item, index) {

src/views/page/orderManage-sup/alreadyDelivery/alreadyDetail.vue

@@ -338,7 +338,6 @@
     </el-dialog>
     <!-- UDI码 -->
     <el-dialog title="UDI码" :visible.sync="udidialog" width="70%">
-      <el-form :model="udiData" ref="udiData">
         <el-table element-loading-text="加载中" :data="udiData" fit stripe border>
           <template slot="empty">
             <img src="@/assets/nopage.png" alt />
@@ -373,7 +372,6 @@
           </el-table-column>
           <el-table-column label="UDI码" prop="udid" width="120"></el-table-column>
         </el-table>
-      </el-form>
     </el-dialog>
   </div>
 </template>
@@ -454,6 +452,7 @@ export default {
         { value: "0", name: "否" },
       ],
       udidialog: false,
+      udiData:[]
     };
   },
   created() {
@@ -704,12 +703,13 @@ export default {
       //     prodEntp:row.prodEntp,
       //     fasBtch:row.fasBtch,
       // }
-      // const obj = { a: 1, b: 2 };
-      // const copiedObjects = Array.from({ length: n }, () => ({ ...obj }));
-      // const n = row.udid;
-      // const copiedObjects = Array.from({ length: n }, () => ({ ...udiObj }));
-      // console.log(copiedObjects,"copiedObjects")
-      // this.udiData = copiedObjects
+      aaa().then((res)=>{
+        if(res.success==true){
+          this.udiData = res.data
+        }else{
+          this.$message.error("获取失败")
+        }
+      })
     },
     // 返回
     handleBack() {

src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -1507,7 +1507,7 @@ export default {
             });
           })
           .catch((err) => {
-            this.$message.error("出库失败")
+            // this.$message.error("出库失败")
 
             // this.confirmLoadLoad = false;
           });