【修改】。。。

src/views/supply/apply/components/apply_examine.vue

@@ -82,6 +82,16 @@
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.price | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.totalAmount | numToFixed }}
+          </template>
+        </el-table-column>
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">

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

@@ -51,7 +51,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="项目类别" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别"></el-input>
+            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -61,7 +61,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="跨厂区编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号"></el-input>
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">

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

@@ -393,6 +393,7 @@ export default {
         address: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
         enginNum: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
         loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
+        tradeCategory: [{ required: true, message: '请选择行业类别', trigger: 'change' }],
       },
       loginTypeList: [],
       powerList: [],

src/views/supply/engin/engin_list.vue

@@ -209,7 +209,7 @@
                 <el-button
                   type="text"
                   @click="toForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (!isDealer || (isDealer && scope.row.examineStatus === 'SAVE'))">
                   编辑
                 </el-button>
                 <el-button
@@ -325,6 +325,9 @@ export default {
   },
 
   computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
     exParams() {
       return {
         enginInfoNo: this.screenForm.orderNum,

src/views/supply/implement/implement_list.vue

@@ -174,9 +174,11 @@
                 {{scope.row.refundProductAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
       </div>

src/views/supply/retail/retail_list.vue

@@ -202,6 +202,7 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="表头备注" prop="k3Remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>