耗材修改

src/views/invoicing/consumable/information.vue

@@ -166,6 +166,7 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" prop="bizName" />
+          <el-table-column v-if="variabilitytitle == '消耗'" label="订单编号" prop="orderNo" />
           <!-- 减少数量 -->
           <el-table-column v-if="variabilitytitle == '报损'" label="图片" prop="coverImg" />
           <!-- 尾巴 -->
@@ -341,8 +342,8 @@
             <el-form-item label=" ">
               <i class="el-icon-remove-outline color-danger" @click="ruleFormsReduce(index)"></i>
             </el-form-item>
-            <el-form-item label="单位" prop="conUnit">
+            <el-form-item label="耗材信息名称" prop="conName">
-              <el-input v-model="item.conUnit" placeholder="请输入单位"></el-input>
+              <el-input v-model="item.conName" placeholder="请输入耗材信息名称"></el-input>
             </el-form-item>
             <el-form-item label="耗材类型" prop="conTypeId">
               <el-select v-model="item.conTypeId" placeholder="请选择"
@@ -368,8 +369,9 @@
             >去选择</el-button
           >
         </el-form-item>  -->
-            <el-form-item label="耗材信息名称" prop="conName">
+
-              <el-input v-model="item.conName" placeholder="请输入耗材信息名称"></el-input>
+            <el-form-item label="单位" prop="conUnit">
+              <el-input v-model="item.conUnit" placeholder="请输入单位"></el-input>
             </el-form-item>
             <!-- <el-form-item label="耗材信息代码" prop="conCode">
           <el-input
@@ -403,9 +405,7 @@
 
       <template v-else>
         <el-form :inline="true" ref="refruleForm" :model="ruleForm" :rules="rules" class="demo-form-inline">
-          <el-form-item label="单位" prop="conUnit">
+
-            <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
-          </el-form-item>
           <!-- <el-form-item label="单位" prop="conUnit" v-if="dialogtitle == '添加'">
           <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
         </el-form-item>
@@ -443,6 +443,9 @@
           <!-- <el-form-item label="耗材价格">
             <el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
           </el-form-item> -->
+          <el-form-item label="单位" prop="conUnit">
+            <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
+          </el-form-item>
           <el-form-item label="预警值">
             <el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
           </el-form-item>
@@ -1029,7 +1032,7 @@ export default {
         this.dialogtitle = "添加";
         this.gettbConsType()
         this.$nextTick(() => {
-          // this.$refs.refruleForm.resetFields();
+          this.$refs.refruleForm.resetFields();
           this.resetRuleForms()
         });
       } else {

src/views/invoicing/operation_out.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
         <div class="head-container">
             <el-form ref="queryForm" :model="queryForm" :rules="queryRules" label-position="left" label-width="80px">
-                <el-form-item label="出库内容">
+                <!-- <el-form-item label="出库内容">
                     <div class="shop_type_box">
                         <div class="item" v-for="item in inTabs" :key="item.value"
                             :class="{ active: inTabValue == item.value }" @click="tabChange(item.value, item.type)">
@@ -12,7 +12,7 @@
                             </div>
                         </div>
                     </div>
-                </el-form-item>
+                </el-form-item> -->
                 <!-- <el-form-item label="出库类型" v-if="inTabValue == 'goods'">
                     <div class="shop_type_box">
                         <div class="item" v-for="(item, index) in shopTypes" :key="index"
@@ -228,7 +228,7 @@ export default {
     data() {
         return {
             formatDecimal,
-            inTabValue: 'goods',
+            inTabValue: 'consumable',
             inTabs: [
                 {
                     label: '商品出库',
@@ -241,7 +241,7 @@ export default {
                     type: 'out'
                 }
             ],
-            shopTypesActive: 1,
+            shopTypesActive: 0,
             shopTypes: [
                 {
                     label: '供应商退货',

src/views/product/add_shop.vue

@@ -752,17 +752,21 @@ export default {
 
     // 提交
     submitHandle() {
-      console.log(this.form.skuList)
+      // 如果找到undefined，立即停止搜索并返回true
       const hasUndefined = this.form.skuList.some(obj => {
         for (const key in obj) {
-          console.log(key, obj)
+          if (this.shopTypesActive == 0) {//单规格判断
-          if (obj['salePrice'] === undefined || obj['memberPrice'] === undefined || obj['costPrice'] === undefined || obj['originPrice'] === undefined) {
+            if (obj['salePrice'] == undefined || obj['memberPrice'] == undefined) {
-            return true; // 如果找到undefined，立即停止搜索并返回true
+              return true;
+            }
+          } else {//多规格判断  
+            if (obj['salePrice'] == undefined || obj['memberPrice'] == undefined || obj['costPrice'] == undefined || obj['originPrice'] == undefined) {
+              return true;
+            }
           }
         }
-        return false; // 如果没有找到undefined，返回false
+        return false;
       });
-      // 停止执行下面的数据
       if (hasUndefined) {
         this.$message({
           message: "请完善规格属性的参数！",
@@ -770,6 +774,7 @@ export default {
         });
         return false;
       }
+      
       let arr = [];
       this.imgList.forEach((ele) => {
         arr.push(ele.url);