sunyize 2 лет назад
Родитель
Сommit
1a89579ef3
2 измененных файлов с 65 добавлено и 24 удалено
  1. 20 6
      src/views/lotCheck/TaskUploadData.vue
  2. 45 18
      src/views/lotCheck/modules/TaskCheckAudit.vue

+ 20 - 6
src/views/lotCheck/TaskUploadData.vue

@@ -47,16 +47,13 @@
               <a-input v-model="infoModel.staffName" placeholder="发展员工姓名" :disabled='true'></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-model-item label="用户编号" v-bind="labelCol4">
-              <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="6">
             <a-form-model-item label="入网时间" prop="networkAccessTime" v-bind="labelCol4">
               <a-input v-model="infoModel.networkAccessTime" placeholder="入网时间" :disabled='true'></a-input>
             </a-form-model-item>
           </a-col>
+
+
           <a-col :span="6">
             <a-form-item label="用户状态" v-bind="labelCol4" prop="userState">
               <j-dict-select-tag placeholder="请选择用户状态" v-model="infoModel.userState" dictCode="user_status_2"/>
@@ -142,7 +139,14 @@
             </a-form-model-item>
 
           </a-col>
-
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="用户编号"  v-bind="labelCol8">
+              <!--              <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>-->
+              <a-textarea  v-model="infoModel.userNo" auto-size  :disabled='true' />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-card>
     </a-form-model>
@@ -1464,6 +1468,16 @@ export default {
           sm: {span: 12},
         }
       },
+      labelCol8: {
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 4},
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 20},
+        }
+      },
       labelCol5: {
         labelCol: {
           xs: {span: 24},

+ 45 - 18
src/views/lotCheck/modules/TaskCheckAudit.vue

@@ -49,11 +49,11 @@
                 <a-input v-model="infoModel.staffName" placeholder="发展员工姓名" :disabled='true'></a-input>
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-model-item label="用户编号" v-bind="labelCol4">
-                <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>
-              </a-form-model-item>
-            </a-col>
+<!--            <a-col :span="6">-->
+<!--              <a-form-model-item label="用户编号" v-bind="labelCol4">-->
+<!--                <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
             <a-col :span="6">
               <a-form-model-item label="入网时间" prop="networkAccessTime" v-bind="labelCol4">
                 <a-input v-model="infoModel.networkAccessTime" placeholder="入网时间" :disabled='true'></a-input>
@@ -155,6 +155,14 @@
               </a-form-model-item>
             </a-col>
           </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-model-item label="用户编号"  v-bind="labelCol8">
+                <!--              <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>-->
+                <a-textarea  v-model="infoModel.userNo" auto-size  :disabled='true' />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
         </a-card>
         <div>
           <a-modal v-model:open="open" title="修改历史" @ok="handleOk" :width="700">
@@ -188,7 +196,7 @@
             <a-col :span="6">
               <a-form-model-item label="是否突破价格管控:" v-bind="labelCol4">
                 <span v-if='infoModel.control==="controlY"' class="cornflowerblue">是</span>
-                <span v-if='infoModel.blockType==="controlN"' class="cornflowerblue">否</span>
+                <span v-if='infoModel.control==="controlN"' class="cornflowerblue">否</span>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -208,11 +216,11 @@
                 <span class="cornflowerblue">{{ infoModel.staffName }}</span>
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-model-item label="用户编号:" v-bind="labelCol4">
-                <span class="cornflowerblue">{{ infoModel.userNo }}</span>
-              </a-form-model-item>
-            </a-col>
+<!--            <a-col :span="6">-->
+<!--              <a-form-model-item label="用户编号:" v-bind="labelCol4">-->
+<!--                <span class="cornflowerblue">{{ infoModel.userNo }}</span>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
           </a-row>
 
           <a-row>
@@ -221,9 +229,14 @@
                 <span class="cornflowerblue">{{ infoModel.staffName }}</span>
               </a-form-model-item>
             </a-col>
+<!--            <a-col :span="6">-->
+<!--              <a-form-model-item label="用户编号:" v-bind="labelCol4">-->
+<!--                <span class="cornflowerblue">{{ infoModel.userNo }}</span>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
             <a-col :span="6">
-              <a-form-model-item label="用户编号:" v-bind="labelCol4">
-                <span class="cornflowerblue">{{ infoModel.userNo }}</span>
+              <a-form-model-item label="营业执照到期时间:" v-bind="labelCol4">
+                <span class="cornflowerblue"> {{ infoModel.businessLicenseDate === "" ? "长期" : infoModel.businessLicenseDate }}</span>
               </a-form-model-item>
             </a-col>
             <a-col :span="6">
@@ -286,14 +299,18 @@
                 <span class="cornflowerblue">{{ infoModel.contractDate === "" ? "长期" : infoModel.contractDate }}</span>
               </a-form-model-item>
             </a-col>
+            <a-row>
+              <a-col :span="12">
+                <a-form-model-item label="用户编号"  v-bind="labelCol8">
+                  <!--              <a-input v-model="infoModel.userNo" placeholder="用户编号" :disabled='true'></a-input>-->
+                  <a-textarea  v-model="infoModel.userNo" auto-size  :disabled='true' />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
           </a-row>
 
           <a-row>
-            <a-col :span="6">
-              <a-form-model-item label="营业执照到期时间:" v-bind="labelCol4">
-                <span class="cornflowerblue"> {{ infoModel.businessLicenseDate === "" ? "长期" : infoModel.businessLicenseDate }}</span>
-              </a-form-model-item>
-            </a-col>
+
           </a-row>
 
           <!--      稽核状态  -->
@@ -1913,6 +1930,16 @@ export default {
           sm: {span: 12},
         }
       },
+      labelCol8: {
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 4},
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 20},
+        }
+      },
       labelCol5: {
         labelCol: {
           xs: {span: 24},