【修改】工程信息单

src/views/supply/engin/components/engin_detail.vue

@@ -17,6 +17,10 @@
           <div class="value">{{detailData.orderDate}}</div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">业务员</div>
+          <div class="value">{{detailData.serviceName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
@@ -25,8 +29,8 @@
           <div class="value">{{detailData.projectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">单据类型</div>
-          <div class="value">{{detailData.orderType}}</div>
+          <div class="label">机型类别</div>
+          <div class="value">{{detailData.machineType}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商名称</div>
@@ -37,8 +41,8 @@
           <div class="value">{{detailData.useUnit}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{detailData.installAddress}}</div>
+          <div class="label">行业类别</div>
+          <div class="value">{{detailData.tradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">工程编号</div>
@@ -49,8 +53,8 @@
           <div class="value">{{detailData.enginFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">行业类别</div>
-          <div class="value">{{detailData.tradeCategory}}</div>
+          <div class="label">工程登录类型</div>
+          <div class="value">{{detailData.enginSignType}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
@@ -64,6 +68,26 @@
           <div class="label">固定电话</div>
           <div class="value">{{detailData.tel}}</div>
         </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.installAddress}}</div>
+        </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{detailData.geLiInerNote}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">权限分类</div>
+          <div class="value">{{detailData.powerCategory}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力回复</div>
+          <div class="value">{{detailData.geLiNote}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createBy}}</div>
@@ -76,14 +100,6 @@
           <div class="label">合同有效期</div>
           <div class="value">{{detailData.contractExpireDate}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
       </el-row>
     </div>
 

src/views/supply/engin/components/engin_examine.vue

@@ -17,8 +17,17 @@
           <div class="value">{{detailData.orderDate}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <div class="label">业务员</div>
+          <div class="value">
+            <el-select v-model="detailData.serviceId" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
+              <el-option
+                v-for="item in salesmanList"
+                :key="item.adminUserId"
+                :label="item.nickName"
+                :value="item.adminUserId">
+              </el-option>
+            </el-select>
+          </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
@@ -52,9 +61,9 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">安装地址</div>
+          <div class="label">行业类别</div>
           <div class="value">
-            <el-input v-model="detailData.installAddress" placeholder="请输入安装地址"></el-input>
+            <el-input v-model="detailData.tradeCategory" placeholder="请输入行业类别"></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -98,6 +107,30 @@
             <el-input v-model="detailData.tel" placeholder="请输入固定电话"></el-input>
           </div>
         </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">
+            <el-input v-model="detailData.installAddress" placeholder="请输入安装地址"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">
+            <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力回复</div>
+          <div class="value">
+            <el-input v-model="detailData.geLiNote" placeholder="请输入格力回复"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">备注</div>
+          <div class="value">
+            <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
+          </div>
+        </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createBy}}</div>
@@ -119,25 +152,6 @@
             </el-date-picker>
           </div>
         </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">
-            <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
-          </div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">业务员</div>
-          <div class="value">
-            <el-select v-model="detailData.serviceId" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
-              <el-option
-                v-for="item in salesmanList"
-                :key="item.adminUserId"
-                :label="item.nickName"
-                :value="item.adminUserId">
-              </el-option>
-            </el-select>
-          </div>
-        </el-col>
       </el-row>
     </div>
 

src/views/supply/engin/components/engin_form.vue

@@ -88,11 +88,6 @@
             <el-input v-model="mainForm.tradeCategory" placeholder="请输入行业类别"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="安装地址" prop="address">
-            <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程编号" prop="enginNum">
             <el-input v-model="mainForm.enginNum" placeholder="请输入工程编号"></el-input>
@@ -128,6 +123,11 @@
             <el-input v-model="mainForm.tel" placeholder="请输入固定电话"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="安装地址" prop="address">
+            <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="24" :lg="16">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>

src/views/supply/engin/engin_list.vue

@@ -118,7 +118,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程信息单号" prop="enginInfoNo" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="工程信息单号" prop="enginInfoNo" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <span>{{scope.row.enginInfoNo}}</span>