Browse Source

【修改】工程订单/信息单

莫绍宝 3 years ago
parent
commit
93296010e9

+ 3 - 3
src/views/supply/engin/components/commerce_form.vue

@@ -114,7 +114,7 @@
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="8" v-if="!isDealer">
           <el-form-item label="权限分类" prop="power">
           <el-form-item label="权限分类" prop="power">
             <el-select v-model="mainForm.power" placeholder="选择权限分类" size="small" clearable style="width: 100%">
             <el-select v-model="mainForm.power" placeholder="选择权限分类" size="small" clearable style="width: 100%">
               <el-option
               <el-option
@@ -273,7 +273,7 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
 
 
-        <!-- <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable>
             <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable>
               <el-option
               <el-option
@@ -284,7 +284,7 @@
               </el-option>
               </el-option>
             </el-select>
             </el-select>
           </template>
           </template>
-        </el-table-column> -->
+        </el-table-column>
 
 
         <el-table-column align="center" label="操作" width="100" fixed="right">
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
           <template slot-scope="scope">

+ 1 - 1
src/views/supply/engin/components/engin_form.vue

@@ -373,7 +373,7 @@ export default {
         greeReply: '',
         greeReply: '',
       },
       },
       mainFormRules: {
       mainFormRules: {
-        // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
+        salesMan: [{ required: true, message: '请选择业务员', trigger: 'change' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         enginName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         enginName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],

+ 1 - 1
src/views/supply/engin/engin_list.vue

@@ -209,7 +209,7 @@
                 <el-button
                 <el-button
                   type="text"
                   type="text"
                   @click="toForm(scope.row)"
                   @click="toForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles)">
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
                   编辑
                   编辑
                 </el-button>
                 </el-button>
                 <el-button
                 <el-button