12/26 选入添加计量单位

src/views/pharmaceuticals/distribution/DialogCheck.vue

@@ -2,20 +2,20 @@
   <div>
     <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
       <el-card style="margin-top: -30px">
-        <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-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-row>
           <el-col :span="3">
             <div class="ao-text">
-              <span>规格型号：</span>
+              <span>包装规格：</span>
             </div>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="name">
-              <el-input v-model="inputQuery.spec" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="inputQuery.bzgg" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
@@ -123,108 +123,108 @@
         </el-row>
 
 
-        <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>检验报告上传：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <el-upload
-                :disabled="formData.auditStatus == 1"
-                class="upload-demo"
-                ref="upload"
-                :action="this.uploadUrl"
-                :on-preview="uploadHandlePreview"
-                :on-remove="uploadHandleRemove"
-                :limit="1"
-                :headers="headers"
-                :on-exceed="uploadHandleExceed"
-                accept=".jpg,.png,.pdf"
-                :on-change="uploadOnchange"
-                :on-success="uploadHandleSuccess"
-                :on-error="uploadHandleError"
-                :on-before="uploadHandleBefore"
-                :file-list="fileList"
-                :data="{type:'image2'}"
-                :auto-upload="true">
-                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
-                  {{ choiceFile }}
-                </el-button>
-                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
-              </el-upload>
-
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text" v-if="this.inputQuery.filePath!=null">
-              <span>检验报告预览：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
-                       style="text-align:right" @click="showImgViewer">
-              检验报告预览
-            </el-button>
-            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
-                             :url-list="imgList"/>
-          </el-col>
-
-
-        </el-row>
-
-
-        <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>冷链报告上传：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <el-upload
-                :disabled="formData.auditStatus == 1"
-                class="upload-demo"
-                ref="upload"
-                :action="this.uploadUrl"
-                :on-preview="uploadHandlePreview"
-                :on-remove="uploadHandleRemove1"
-                :limit="1"
-                :headers="headers"
-                :on-exceed="uploadHandleExceed"
-                accept=".jpg,.png,.pdf"
-                :on-change="uploadOnchange1"
-                :on-success="uploadHandleSuccess1"
-                :on-error="uploadHandleError"
-                :on-before="uploadHandleBefore"
-                :file-list="fileList"
-                :data="{type:'image2'}"
-                :auto-upload="true">
-                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
-                  {{ choiceFile1 }}
-                </el-button>
-                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
-              </el-upload>
-
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text" v-if="this.inputQuery.coldFilePath!=null">
-              <span>冷链报告预览：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.coldFilePath!=null"
-                       style="text-align:right" @click="showImgViewerCold">
-              冷链报告预览
-            </el-button>
-            <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
-
-          </el-col>
-
-
-        </el-row>
+        <!--<el-row>-->
+        <!--  <el-col :span="3">-->
+        <!--    <div class="ao-text">-->
+        <!--      <span>检验报告上传：</span>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--  <el-col :span="8">-->
+        <!--    <el-form-item>-->
+        <!--      <el-upload-->
+        <!--        :disabled="formData.auditStatus == 1"-->
+        <!--        class="upload-demo"-->
+        <!--        ref="upload"-->
+        <!--        :action="this.uploadUrl"-->
+        <!--        :on-preview="uploadHandlePreview"-->
+        <!--        :on-remove="uploadHandleRemove"-->
+        <!--        :limit="1"-->
+        <!--        :headers="headers"-->
+        <!--        :on-exceed="uploadHandleExceed"-->
+        <!--        accept=".jpg,.png,.pdf"-->
+        <!--        :on-change="uploadOnchange"-->
+        <!--        :on-success="uploadHandleSuccess"-->
+        <!--        :on-error="uploadHandleError"-->
+        <!--        :on-before="uploadHandleBefore"-->
+        <!--        :file-list="fileList"-->
+        <!--        :data="{type:'image2'}"-->
+        <!--        :auto-upload="true">-->
+        <!--        <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
+        <!--          {{ choiceFile }}-->
+        <!--        </el-button>-->
+        <!--        <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>-->
+        <!--      </el-upload>-->
+
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--  &lt;!&ndash;<el-col :span="3">&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <div class="ao-text" v-if="this.inputQuery.filePath!=null">&ndash;&gt;-->
+        <!--  &lt;!&ndash;    <span>检验报告预览：</span>&ndash;&gt;-->
+        <!--  &lt;!&ndash;  </div>&ndash;&gt;-->
+        <!--  &lt;!&ndash;</el-col>&ndash;&gt;-->
+        <!--  &lt;!&ndash;<el-col :span="8">&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"&ndash;&gt;-->
+        <!--  &lt;!&ndash;             style="text-align:right" @click="showImgViewer">&ndash;&gt;-->
+        <!--  &lt;!&ndash;    检验报告预览&ndash;&gt;-->
+        <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"&ndash;&gt;-->
+        <!--  &lt;!&ndash;                   :url-list="imgList"/>&ndash;&gt;-->
+        <!--  &lt;!&ndash;</el-col>&ndash;&gt;-->
+
+
+        <!--</el-row>-->
+
+
+        <!--<el-row>-->
+        <!--  <el-col :span="3">-->
+        <!--    <div class="ao-text">-->
+        <!--      <span>冷链报告上传：</span>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--  <el-col :span="8">-->
+        <!--    <el-form-item>-->
+        <!--      <el-upload-->
+        <!--        :disabled="formData.auditStatus == 1"-->
+        <!--        class="upload-demo"-->
+        <!--        ref="upload"-->
+        <!--        :action="this.uploadUrl"-->
+        <!--        :on-preview="uploadHandlePreview"-->
+        <!--        :on-remove="uploadHandleRemove1"-->
+        <!--        :limit="1"-->
+        <!--        :headers="headers"-->
+        <!--        :on-exceed="uploadHandleExceed"-->
+        <!--        accept=".jpg,.png,.pdf"-->
+        <!--        :on-change="uploadOnchange1"-->
+        <!--        :on-success="uploadHandleSuccess1"-->
+        <!--        :on-error="uploadHandleError"-->
+        <!--        :on-before="uploadHandleBefore"-->
+        <!--        :file-list="fileList"-->
+        <!--        :data="{type:'image2'}"-->
+        <!--        :auto-upload="true">-->
+        <!--        <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
+        <!--          {{ choiceFile1 }}-->
+        <!--        </el-button>-->
+        <!--        <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>-->
+        <!--      </el-upload>-->
+
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--  &lt;!&ndash;<el-col :span="3">&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <div class="ao-text" v-if="this.inputQuery.coldFilePath!=null">&ndash;&gt;-->
+        <!--  &lt;!&ndash;    <span>冷链报告预览：</span>&ndash;&gt;-->
+        <!--  &lt;!&ndash;  </div>&ndash;&gt;-->
+        <!--  &lt;!&ndash;</el-col>&ndash;&gt;-->
+        <!--  &lt;!&ndash;<el-col :span="8">&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.coldFilePath!=null"&ndash;&gt;-->
+        <!--  &lt;!&ndash;             style="text-align:right" @click="showImgViewerCold">&ndash;&gt;-->
+        <!--  &lt;!&ndash;    冷链报告预览&ndash;&gt;-->
+        <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+        <!--  &lt;!&ndash;  <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>&ndash;&gt;-->
+
+        <!--  &lt;!&ndash;</el-col>&ndash;&gt;-->
+
+
+        <!--</el-row>-->
 
 
 

src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue

@@ -953,7 +953,7 @@
 
 
     <el-dialog
-      title="检验报告"
+      title="单据详情"
       :visible.sync="Upinvoice"
       :before-close="freshen"
       width="60%"

src/views/supplier/companyDrug/basicCompanyProductsImport.vue

@@ -239,6 +239,7 @@
           <!--</el-row>-->
 
           <el-row>
+
             <el-col :span="12" class="el-col">
               <el-form-item label="商品条码" prop="sptm">
                 <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码"
@@ -320,13 +321,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="el-col">
-              <el-form-item label="计量单位" prop="measname">
-                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
-                          v-model="editQuery.measname"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+
           </el-row>
 
           <el-row>
@@ -452,13 +447,7 @@
           </el-col>
         </el-row>
         <el-row type="flex">
-          <el-col :span="11" class="el-col">
-            <el-form-item label="商品条码:" prop="cpmctymc">
-              <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.sptm"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+
           <!--<el-col :span="11" class="el-col">-->
           <!--  <el-form-item label="耗材材质:" prop="matrial">-->
           <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
@@ -473,7 +462,31 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="计量单位:" prop="distributeLevel" >
 
+              <el-select v-model="repEditQuery.distributeLevel" size="small" style="width: 90%"
+                         placeholder="请选择计量单位"
+              >
+                <el-option
+                  v-for="item in levelUnitList"
+                  :key="item.packLevel"
+                  :value="item.packLevel"
+                  :label="item.packUnit"
+                >
+                  <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                  <span style="float: left">层级:{{ item.packLevel }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="计量单位" prop="measname">-->
+          <!--    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
+          <!--              v-model="editQuery.measname"-->
+          <!--    ></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
@@ -525,13 +538,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="计量单位:" prop="measname">
+            <el-form-item label="商品条码:" prop="cpmctymc">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.measname"
+                        v-model.trim="repEditQuery.sptm"
               ></el-input>
             </el-form-item>
           </el-col>
 
+          <!--<el-col :span="11" class="el-col">-->
+          <!--  <el-form-item label="计量单位:" prop="measname">-->
+          <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--              v-model.trim="repEditQuery.measname"-->
+          <!--    ></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
@@ -836,6 +857,7 @@ import { isBlank } from '@/utils/strUtil'
 import { getHslbs, getThrProductType } from '@/api/thrsys/thrHsfl'
 import { filterClassify } from '@/api/purchase/classifyCode'
 import { executeFuc, getHead } from '@/utils/customConfig'
+import { levelByUuid } from '@/api/basic/product/udiInfo'
 
 export default {
   name: 'UdIInfoSelect',
@@ -915,7 +937,8 @@ export default {
         flbm: null,
         requireScanCode: null,
         ggxh: null,
-        detailSort: null
+        detailSort: null,
+        distributeLevel: null,
 
       },
       relevanceEdit: {
@@ -959,13 +982,18 @@ export default {
 
         detailSort: [
           { required: true, message: '请选择明细分类', trigger: 'blur' }
+        ],
+        distributeLevel: [
+          { required: true, message: '请选择计量单位', trigger: 'blur' }
         ]
+
         // useMaxLevel: [
         //   {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
         // ],
       },
       //是否以89开头
-      isSpecial: false
+      isSpecial: false,
+      levelUnitList: [],
     }
   },
 
@@ -1140,7 +1168,7 @@ export default {
         this.loading = false
         if (response.code == 20000) {
           this.$message.success(response.data)
-          this.$emit('closeSelDialog', true)
+          // this.$emit('closeSelDialog', true)
           this.closeSelDialog()
         } else {
           this.$message.error(response.message)
@@ -1210,6 +1238,7 @@ export default {
       if (!isBlank(this.currentRow.nameCode) && this.currentRow.nameCode.startsWith('89')) {
         this.isSpecial = true
       }
+      this.getDiLevel(selection.id)
       this.replTitle = '(' + this.currentRow.cpmctymc + ')' + '药品信息补齐:'
       this.repEditQuery.sptm = this.currentRow.sptm
       this.repEditQuery.ybbm = this.currentRow.ybbm
@@ -1226,8 +1255,11 @@ export default {
       this.repEditQuery.zczbhhzbapzbh = this.currentRow.zczbhhzbapzbh
       this.repEditQuery.packMatrial = this.currentRow.packMatrial
       this.repEditQuery.measname = this.currentRow.measname
+      this.repEditQuery.distributeLevel = this.currentRow.distributeLevel
+
       this.getYbHcData()
       this.classifySearch()
+
       // if (isBlank(this.relevanceEdit.cpms)) {
       //   this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
       // }
@@ -1382,13 +1414,28 @@ export default {
         .catch(() => {
           this.loading = false
         })
-    }
+    },
+    getDiLevel(rlId) {
+      let query = {
+        id: rlId
+      }
+      this.loading = true
+      levelByUuid(query)
+        .then((response) => {
+          this.loading = false
+          this.levelUnitList = response.data || []
+          // this.findMaxLevelObject()
+        })
+        .catch(() => {
+          this.loading = false
+          this.levelUnitList = []
+        })
+    },
   },
   mounted() {
   },
   components: {},
   created() {
-    console.log('jsjjsjjsjsj', this.productIds)
     getHead('basicCompanyProductsImport', '1').then((re) => {
       // 处理返回的数据
       this.tableObj = re.data