Merge branch 'project9-8' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project9-8

src/views/template/outcomeWmsApply.vue

@@ -313,10 +313,6 @@ export default {
       ],
       // ptype菜单
       ptypeOptions: [
-        {
-          dictLabel: 'jb',
-          dictValue: '1'
-        },
         {
           dictLabel: 'label',
           dictValue: '2'

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -119,10 +119,6 @@
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.ptype=== '1'">jb</span>
-            <span v-else-if="scope.row.ptype=== '2'">label</span>
-            <span v-else-if="scope.row.ptype=== '3'">wd</span>
-            <span v-else-if="scope.row.ptype === '4'">sl</span>
-            <span v-else-if="scope.row.ptype === '5'">zd</span>
             <span v-else-if="scope.row.ptype=== '20'">jl</span>
             <span v-else>-</span>
           </template>
@@ -258,9 +254,6 @@
             @input="handleInputChange"
           />
         </el-form-item>
-        <el-form-item label="库存QTY">
-          <span style="color: red">{{ warehousedata.qty||'-' }}</span>
-        </el-form-item>
         <el-form-item label="lot" prop="lot">
           <el-input
             v-model.trim="form.lot"
@@ -270,6 +263,9 @@
             @input="handleInputChange"
           />
         </el-form-item>
+        <el-form-item label="库存QTY">
+          <span style="color: red">{{ warehousedata.qty||'-' }}</span>
+        </el-form-item>
         <el-form-item label="qty" prop="qty">
           <el-input v-model.trim="form.qty" placeholder="请输入qty的值" />
         </el-form-item>
@@ -295,40 +291,40 @@
     <!-- 导入配置对话框   -->
     <el-dialog class="importDialog" :title="importControls.title" :visible="importControls.open" width="700px" append-to-body :close-on-click-modal="false" @close="cancelFileFrom">
       <el-form :model="typeFrom">
-        <el-form-item >
-          <el-input
+        <el-form-item>
+          <!--          <el-input-->
+          <!--            v-model="typeFrom.type"-->
+          <!--            placeholder="typeFrom"-->
+          <!--            :maxlength="2"-->
+          <!--            size="small"-->
+          <!--            disabled-->
+          <!--            style="width: 150px"-->
+          <!--           >-->
+          <!--          </el-input>-->
+          <el-select
             v-model="typeFrom.type"
             placeholder="typeFrom"
             :maxlength="2"
             size="small"
             disabled
             style="width: 150px"
-           >
-          </el-input>
-<!--          <el-select-->
-<!--            v-model="typeFrom.type"-->
-<!--            placeholder="typeFrom"-->
-<!--            :maxlength="2"-->
-<!--            size="small"-->
-<!--            disabled-->
-<!--            style="width: 150px"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="(dict,index) in typeList"-->
-<!--              :key="index"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
-<!--          </el-select>-->
+          >
+            <el-option
+              v-for="(dict,index) in typeList"
+              :key="index"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
-      <div  class="importOne">
+      <div class="importOne">
         <div>
           <!--     下载模型按钮         -->
           <div class="downloadTemplateDiv">
             <el-button class="downloadTemplateDivButton" type="primary" :loading="downloadTemplateLoading" size="small" @click="downloadTemplate">下载模板</el-button>
           </div>
-          <div class="uploadCont">
+          <div v-if="typeFrom.type === '1'" class="uploadCont">
             <el-upload
               accept=".xlsx, .xls"
               :headers="importControls.headers"
@@ -378,10 +374,6 @@
           <el-col :span="12">
             <el-form-item label="ptype：" prop="ptype">
               <span v-if="singleDetails.ptype === '1'">jb</span>
-              <span v-else-if="singleDetails.ptype === '2'">label</span>
-              <span v-else-if="singleDetails.ptype === '3'">wd</span>
-              <span v-else-if="singleDetails.ptype === '4'">sl</span>
-              <span v-else-if="singleDetails.ptype === '5'">zd</span>
               <span v-else-if="singleDetails.ptype === '20'">jl</span>
               <span v-else>-</span>
             </el-form-item>
@@ -469,13 +461,17 @@ export default {
     return {
       // 类型表单
       typeFrom: {
-        type: 'jb'
+        type: '1'
       },
       // 类型下拉框
       typeList: [
         {
           label: 'jb',
           value: '1'
+        },
+        {
+          label: 'jl',
+          value: '20'
         }
       ],
       // 导入列表
@@ -660,11 +656,19 @@ export default {
                 if (res.data !== null) {
                   console.log('res', res)
                   this.warehousedata = res.data
+                } else {
+                  this.warehousedata.qty = null
                 }
               }
             })
+          } else {
+            this.warehousedata.qty = null
           }
+        } else {
+          this.warehousedata.qty = null
         }
+      } else {
+        this.warehousedata.qty = null
       }
     },
     handleRemove(file, fileList) {
@@ -703,7 +707,7 @@ export default {
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob)// 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = '导出空模板' + '.xls' // 下载后文件名
+        downloadElement.download = 'JB导入模板' + '.xls' // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click()// 点击下载
         document.body.removeChild(downloadElement)// 下载完成移除元素
@@ -988,11 +992,10 @@ export default {
   }
   ::v-deep .el-dialog__body{
     overflow-y: visible;
+    max-height: 189vh;
   }
   ::v-deep .dialog-footer {
-    margin-top: 5%;
   }
-
 }
 //.my-custom-form {
 //  height: 600px; /* 设置表单的高度 */