From d1c90f4605cb3e9e4e70f295825265d03a8c52bf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Mar 2023 14:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=BF=81=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/productEdit.vue       |  20 +-
 .../supplier/company/basicCompanyProducts.vue |   3 +-
 .../company/basicCompanyproductEdit.vue       | 202 +++++++++++-------
 3 files changed, 148 insertions(+), 77 deletions(-)

diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 38d6134..1c5fb48 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -337,7 +337,25 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
-
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">启用使用单元</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isUseDy" style="width: 65%"
+                           :disabled="editQuery.useMuti==true "
+                           placeholder="状态" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">启用使用单元</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
             <el-row>
               <el-col span="5">
                 <span class="sptext">多次/重复使用耗材</span>
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 1a866db..655b865 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -85,7 +85,7 @@
             {{ lockStatusMap[scope.row.lockStatus] }}
           </template>
         </el-table-column>
-        <el-table-column width="180" label="操作">
+        <el-table-column width="180" label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="isSpCombine" type="text" size="small"
                        :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
@@ -705,6 +705,7 @@ export default {
         });
     },
     handleModifyClick(row) {
+      debugger
       this.editQuery = row;
       this.editDialogVisible = true;
     },
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 05b0d83..5443a9e 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -12,8 +12,11 @@
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
-            <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
+              关联
+            </el-button>
+            <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                       :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
             </el-button>
           </template>
         </el-table-column>
@@ -29,10 +32,11 @@
       <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;">
-        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
+        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
+                   style="text-align:right">解绑DI器械信息
         </el-button>
       </div>
-      <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row >
+      <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row>
         <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
@@ -41,58 +45,102 @@
     </el-card>
 
     <el-card>
-    <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px" style="margin-top: 20px;  ">
-      <el-row type="flex" class="edit-row">
-        <el-col :span="12">
-          <el-form-item label="商品条码:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="商品名称:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.spmc"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="edit-row">
-        <el-col :span="12">
-          <el-form-item label="计量单位:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="生产企业:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="edit-row">
-        <el-col :span="12">
-          <el-form-item label="产品价格:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="产品描述:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="edit-row">
-        <el-col :span="12">
-          <el-form-item label="医保编码:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-button-group style="display: flex">
-        <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
-                   :loading="loading"
-        >提交
-        </el-button>
-      </el-button-group>
-    </el-form>
+      <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px" style="margin-top: 20px;  ">
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="商品条码:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商品名称:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.spmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="计量单位:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产企业:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="产品价格:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医保编码:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="库存积压预警数量:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.overStockNum"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="低库存预警数量:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.lowStockNum"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="近效期预警时间:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.recentDateTime"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预警时间格式:">
+              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
+                <el-option label="天" :value="1"></el-option>
+                <el-option label="小时" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="产品描述:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-button-group style="display: flex">
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                     :loading="loading"
+          >提交
+          </el-button>
+        </el-button-group>
+      </el-form>
     </el-card>
 
     <el-dialog
@@ -120,9 +168,9 @@
 </template>
 
 <script>
-import { disableUdi, removeDiRl, removeRl, thirdSysDetail } from '@/api/basic/product/udiRelevance'
-import { updateById } from '@/api/basic/udiRelevance'
-import { filterByUuid } from '@/api/basic/udiInfo'
+import {disableUdi, removeDiRl, removeRl, thirdSysDetail} from '@/api/basic/product/udiRelevance'
+import {updateById} from '@/api/basic/udiRelevance'
+import {filterByUuid} from '@/api/basic/udiInfo'
 import selectErp from "./udiInfoselectErpUdi";
 import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
 
@@ -147,27 +195,27 @@ export default {
     return {
       isUseDyCheck: false,
       useNumEnable: true,
-      editDialogVisible:false,
-      sysList:{},
-      relId:null,
-      defaultSys:null,
-      detailList:{},
-      isImport:null,
+      editDialogVisible: false,
+      sysList: {},
+      relId: null,
+      defaultSys: null,
+      detailList: {},
+      isImport: null,
       thisData: {
         nameCode: null,
         cpmctymc: null,
         ggxh: null
       },
-      selectVersionVisible:false,
+      selectVersionVisible: false,
       originUuid: null,
-      uuid:null,
+      uuid: null,
       editSingleFormat: {
         uuid: null,
         relId: null,
         sptm: null,
         packUnit: null,
         measname: null,
-        nameCode:null
+        nameCode: null
       },
       editSingleDiDialogVisible: false,
       selectErpDialogVisible: false,  //选入ERP产品
@@ -176,7 +224,7 @@ export default {
 
   methods: {
     submitUpload() {
-
+      debugger
       var data = {
         id: this.editQuery.prid,
         sptm: this.editQuery.sptm,
@@ -185,13 +233,17 @@ export default {
         manufactory: this.editQuery.manufactory,
         price: this.editQuery.price,
         cpms: this.editQuery.cpms,
-        ybbm: this.editQuery.ybbm
+        ybbm: this.editQuery.ybbm,
+        overStockNum: this.editQuery.overStockNum,
+        lowStockNum: this.editQuery.lowStockNum,
+        recentDateTime: this.editQuery.recentDateTime,
+        isDateBy: this.editQuery.isDateBy,
       }
 
-      updateById(data).then(res=>{
-        if(res.code==20000){
+      updateById(data).then(res => {
+        if (res.code == 20000) {
           this.closeDialog();
-        }else{
+        } else {
           this.$message.error(response.message);
         }
       })
@@ -214,7 +266,7 @@ export default {
     addSelectErp(row) {
       this.defaultSys = row.sysId;
       this.isImport = false;
-      this.relId=this.editQuery.rlId;
+      this.relId = this.editQuery.rlId;
       this.thisData = this.editQuery;
       this.selectErpDialogVisible = true;
     },
@@ -264,7 +316,7 @@ export default {
                   type: "success",
                   message: "删除成功！",
                 });
-                this.editDialogVisible=false;
+                this.editDialogVisible = false;
                 this.closeDialog();
               } else {
                 this.$message.error(response.message);