Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/demoData/demoData1.vue

@@ -314,7 +314,7 @@ export default {
       console.log('数据源', this.demoData1List)
     },
     formatData(data) {
-      // 遍历数据，提取不重复的月份作为列标签
+      // 遍历数据，提取不重复的月份作为列标签 111
       const months = new Set()
       data.forEach(item => {
         Object.keys(item).forEach(key => {

src/views/template/outcomeWmsApply.vue

@@ -117,6 +117,7 @@
             <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>
         </el-table-column>
@@ -331,6 +332,10 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       addTypeOption: [
@@ -349,6 +354,10 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       // 查询参数

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -293,7 +293,7 @@
       </div>
     </el-dialog>
     <!-- 导入配置对话框   -->
-    <el-dialog class="importDialog" :title="importControls.title" :visible="importControls.open" width="80" append-to-body :close-on-click-modal="false" @close="cancelFileFrom">
+    <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 v-model="typeFrom.type">
           <el-select
@@ -319,7 +319,7 @@
           <div class="downloadTemplateDiv">
             <el-button class="downloadTemplateDivButton" type="primary" :loading="downloadTemplateLoading" size="small" @click="downloadTemplate">下载模板</el-button>
           </div>
-          <div>
+          <div class="uploadCont">
             <el-upload
               accept=".xlsx, .xls"
               :headers="importControls.headers"
@@ -380,13 +380,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="pn：" prop="pn">
-              <span>{{ singleDetails.pn|| '-' }}</span>
+            <el-form-item label="code：" prop="orderCode">
+              <span>{{ singleDetails.orderCode|| '-' }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="qty：" prop="qty">
-              <span>{{ singleDetails.qty|| '-' }}</span>
+            <el-form-item label="pn：" prop="pn">
+              <span>{{ singleDetails.pn|| '-' }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -397,12 +397,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="rank：" prop="rank">
-              <span>{{ singleDetails.rank|| '-' }}</span>
+            <el-form-item label="qty：" prop="qty">
+              <span>{{ singleDetails.qty|| '-' }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="rank：" prop="rank">
+              <span>{{ singleDetails.rank|| '-' }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="出库状态：" prop="ioType">
               <span v-if="singleDetails.dealStatus === '0'">未出库</span>
@@ -410,11 +415,6 @@
               <span v-else>-</span>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注：" prop="remarks">
-              <span>{{ singleDetails.remarks|| '-' }}</span>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -428,6 +428,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注：" prop="remarks">
+              <span>{{ singleDetails.remarks|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-dialog>
 
@@ -458,11 +465,11 @@ export default {
       // 类型下拉框
       typeList: [
         {
-          label: '类型1',
+          label: 'jb',
           value: '1'
         },
         {
-          label: '类型2',
+          label: 'jl',
           value: '20'
         }
       ],
@@ -502,6 +509,7 @@ export default {
         pn: '',
         qty: '',
         lot: '',
+        orderCode: '',
         rank: '',
         dealStatus: '',
         remarks: '',
@@ -715,7 +723,7 @@ export default {
         formData.append('file', this.files)
         importJbapplyExcel(formData).then(res => {
           if (res.code === 200) {
-            this.$message.success(`成功导入`+res.data.rows+`条`)
+            this.$message.success(`成功导入` + res.data.rows + `条`)
             this.importLoading = false
             this.importControls.open = false
             this.files = []
@@ -935,14 +943,25 @@ export default {
      display: flex;
      justify-content: center;
      .downloadTemplateDiv{
-       margin: 40px;
-       display: flex;
-       justify-content: center;
+       //margin: 40px;
+       margin-left: -10%;
+       margin-top: 20px;
+       margin-bottom: 20px;
+       //display: flex;
+       //justify-content: left;
        // 下载模板的按钮样式
        .downloadTemplateDivButton{
 
        }
      }
+    .uploadCont{
+      //margin-top: -10px;
+      margin-top: 38px;
+      ::v-deep .el-upload-dragger{
+        width: 600px;
+      }
+
+    }
   }
   // 第二个标签
 }