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

src/views/template/ConfirmationMaterials.vue

@@ -93,12 +93,12 @@
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.ptype.trim() === '1'">jb</span>
-            <span v-else-if="scope.row.ptype.trim() === '2'">label</span>
-            <span v-else-if="scope.row.ptype.trim() === '3'">wd</span>
-            <span v-else-if="scope.row.ptype.trim() === '4'">sl</span>
-            <span v-else-if="scope.row.ptype.trim() === '5'">zd</span>
-            <span v-else-if="scope.row.ptype.trim() === '20'">jl</span>
+            <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>
         </el-table-column>
@@ -314,10 +314,6 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
-        },
-        {
-          dictLabel: 'jl',
-          dictValue: '20'
         }
       ],
       addTypeOption: [

src/views/template/enterboundTwo.vue

@@ -369,6 +369,10 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       addTypeOption: [
@@ -387,6 +391,10 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       ioTypeSelect: [

src/views/template/incomeWmsBox.vue

@@ -102,6 +102,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>
@@ -252,6 +253,10 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       // 查询参数

src/views/template/outcomeWmsApply.vue

@@ -332,10 +332,6 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
-        },
-        {
-          dictLabel: 'jl',
-          dictValue: '20'
         }
       ],
       addTypeOption: [
@@ -354,10 +350,6 @@ export default {
         {
           dictLabel: 'zd',
           dictValue: '5'
-        },
-        {
-          dictLabel: 'jl',
-          dictValue: '20'
         }
       ],
       // 查询参数

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -118,12 +118,12 @@
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.ptype.trim() === '1'">jb</span>
-            <span v-else-if="scope.row.ptype.trim() === '2'">label</span>
-            <span v-else-if="scope.row.ptype.trim() === '3'">wd</span>
-            <span v-else-if="scope.row.ptype.trim() === '4'">sl</span>
-            <span v-else-if="scope.row.ptype.trim() === '5'">zd</span>
-            <span v-else-if="scope.row.ptype.trim() === '20'">jl</span>
+            <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>
         </el-table-column>
@@ -295,25 +295,34 @@
     <!-- 导入配置对话框   -->
     <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
+        <el-form-item >
+          <el-input
             v-model="typeFrom.type"
             placeholder="typeFrom"
-            clearable
             :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-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-form-item>
       </el-form>
-      <div v-if="typeFrom.type === '1'" class="importOne">
+      <div  class="importOne">
         <div>
           <!--     下载模型按钮         -->
           <div class="downloadTemplateDiv">
@@ -368,12 +377,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="ptype：" prop="ptype">
-              <span v-if="singleDetails.ptype.trim() === '1'">jb</span>
-              <span v-else-if="singleDetails.ptype.trim() === '2'">label</span>
-              <span v-else-if="singleDetails.ptype.trim() === '3'">wd</span>
-              <span v-else-if="singleDetails.ptype.trim() === '4'">sl</span>
-              <span v-else-if="singleDetails.ptype.trim() === '5'">zd</span>
-              <span v-else-if="singleDetails.ptype.trim() === '20'">jl</span>
+              <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>
           </el-col>
@@ -460,17 +469,13 @@ export default {
     return {
       // 类型表单
       typeFrom: {
-        type: '1'
+        type: 'jb'
       },
       // 类型下拉框
       typeList: [
         {
           label: 'jb',
           value: '1'
-        },
-        {
-          label: 'jl',
-          value: '20'
         }
       ],
       // 导入列表
@@ -646,7 +651,7 @@ export default {
             const qbj = {
               pn: this.form.pn,
               lot: this.form.lot,
-              ptype: this.form.ptype.trim()
+              ptype: this.form.ptype
             }
             console.log('qbj', qbj)
             // 发送请求并处理返回结果
@@ -842,7 +847,7 @@ export default {
       this.reset()
       const id = row.businessId
       getOutcomeWmsJbapplyTemp(id).then(response => {
-        response.data.ptype = response.data.ptype.trim()
+        response.data.ptype = response.data.ptype
         this.form = response.data
         this.open = true
         this.title = '修改检查申请'