linwenxin пре 1 година
родитељ
комит
7b0bcfd29a

+ 38 - 36
src/views/sales_policy/components/AddPolicy.vue

@@ -446,43 +446,45 @@
               <el-button v-loading="fullscreenLoading" type="primary" size="mini" @click="handleSave">保存</el-button>
             </div>
           </div>
-
-          <el-row>
-            <el-divider />
-            <el-row type="flex">
-              <el-col :span="12">
-                <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
-                <el-button type="primary" size="mini" @click="isCondition = 1">添加</el-button></el-col>
+          <!-- 不管是新增还是编辑还是详情,如果类型选的是配提才显示这个条件信息,否则隐藏 -->
+          <template v-if="searchForm.type == 'PROVISION'">
+            <el-row>
+              <el-divider />
+              <el-row type="flex">
+                <el-col :span="12">
+                  <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+                  <el-button type="primary" size="mini" @click="isCondition = 1">添加</el-button></el-col>
+              </el-row>
+              <el-divider />
             </el-row>
-            <el-divider />
-          </el-row>
-          <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column fixed type="index" label="序号" width="50" align="left" />
-            <el-table-column prop="name" label="限定条件" align="left">
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.name"
-                  style="text-align: center"
-                  placeholder="请输入名称"
-                  :disabled="scope.row.fang"
-                  @blur="handleConditionName(scope.row)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column fixed="right" width="150" label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="
-                    scope.row.fang = false
-                    conditName = scope.row.name
-                  "
-                >编辑</el-button>
-                <el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+            <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
+              <el-table-column fixed type="index" label="序号" width="50" align="left" />
+              <el-table-column prop="name" label="限定条件" align="left">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.name"
+                    style="text-align: center"
+                    placeholder="请输入名称"
+                    :disabled="scope.row.fang"
+                    @blur="handleConditionName(scope.row)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" width="150" label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="
+                      scope.row.fang = false
+                      conditName = scope.row.name
+                    "
+                  >编辑</el-button>
+                  <el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
         </div>
         <div>
           <el-row>

+ 24 - 21
src/views/sales_policy/components/Examine.vue

@@ -290,28 +290,31 @@
               @current-change="handleCurrentChange2"
             />
           </div>
-          <el-row>
-            <el-divider />
-            <el-row type="flex">
-              <el-col :span="12">
-                <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
-              </el-col>
+          <!-- 不管是新增还是编辑还是详情,如果类型选的是配提才显示这个条件信息,否则隐藏 -->
+          <template v-if="detail.type == 'PROVISION'">
+            <el-row>
+              <el-divider />
+              <el-row type="flex">
+                <el-col :span="12">
+                  <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+                </el-col>
+              </el-row>
+              <el-divider />
             </el-row>
-            <el-divider />
-          </el-row>
-          <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column fixed type="index" label="序号" width="50" align="left" />
-            <el-table-column prop="name" label="限定条件" align="left">
-              <template slot-scope="scope">
-                {{ scope.row.name }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="left" width="150">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="getCommonApi(scope.row)">查看条件</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+            <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
+              <el-table-column fixed type="index" label="序号" width="50" align="left" />
+              <el-table-column prop="name" label="限定条件" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.name }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="left" width="150">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="getCommonApi(scope.row)">查看条件</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
           <el-row>
             <el-divider />
             <el-row type="flex">

+ 39 - 35
src/views/sales_policy/components/details.vue

@@ -300,43 +300,47 @@
               @current-change="handleCurrentChange2"
             />
           </div>
-          <el-row>
-            <el-divider />
-            <el-row type="flex">
-              <el-col :span="12">
-                <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
-              </el-col>
+          <!-- 不管是新增还是编辑还是详情,如果类型选的是配提才显示这个条件信息,否则隐藏 -->
+          <template v-if="detail.type == 'PROVISION'">
+            <el-row>
+              <el-divider />
+              <el-row type="flex">
+                <el-col :span="12">
+                  <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+                </el-col>
+              </el-row>
+              <el-divider />
             </el-row>
-            <el-divider />
-          </el-row>
-          <div class="table">
-            <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
-              <el-table-column fixed type="index" label="序号" width="50" align="left" />
-              <el-table-column prop="name" label="限定条件" align="left">
-                <template slot-scope="scope">
-                  {{ scope.row.name }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="left" width="150">
-                <template slot-scope="scope">
-                  <template v-if="isShow == 5">
-                    <el-button type="text" size="mini" @click="getCommonApi(scope.row)">编辑</el-button>
-                    <el-popconfirm
-                      confirm-button-text="好的"
-                      cancel-button-text="不用了"
-                      icon="el-icon-info"
-                      icon-color="red"
-                      title="内容确定删除吗?"
-                      @confirm="handleCondition(scope.row.id, scope.$index)"
-                    >
-                      <el-button slot="reference" type="text" class="textColor el-popover-left">删除</el-button>
-                    </el-popconfirm>
+            <div class="table">
+              <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
+                <el-table-column fixed type="index" label="序号" width="50" align="left" />
+                <el-table-column prop="name" label="限定条件" align="left">
+                  <template slot-scope="scope">
+                    {{ scope.row.name }}
                   </template>
-                  <el-button v-else type="text" size="mini" @click="getCommonApi(scope.row)">查看条件</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
+                </el-table-column>
+                <el-table-column label="操作" align="left" width="150">
+                  <template slot-scope="scope">
+                    <template v-if="isShow == 5">
+                      <el-button type="text" size="mini" @click="getCommonApi(scope.row)">编辑</el-button>
+                      <el-popconfirm
+                        confirm-button-text="好的"
+                        cancel-button-text="不用了"
+                        icon="el-icon-info"
+                        icon-color="red"
+                        title="内容确定删除吗?"
+                        @confirm="handleCondition(scope.row.id, scope.$index)"
+                      >
+                        <el-button slot="reference" type="text" class="textColor el-popover-left">删除</el-button>
+                      </el-popconfirm>
+                    </template>
+                    <el-button v-else type="text" size="mini" @click="getCommonApi(scope.row)">查看条件</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </template>
+
           <el-row>
             <el-divider />
 

+ 43 - 39
src/views/sales_policy/components/editPolicy.vue

@@ -459,46 +459,50 @@
             <!--              @current-change="handleCurrentChange2"-->
             <!--            />-->
           </div>
-          <el-row>
-            <el-divider />
-            <el-row type="flex">
-              <el-col :span="12">
-                <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
-                <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button>
-              </el-col>
+
+          <!-- 不管是新增还是编辑还是详情,如果类型选的是配提才显示这个条件信息,否则隐藏 -->
+          <template v-if="searchForm.type == 'PROVISION'">
+            <el-row>
+              <el-divider />
+              <el-row type="flex">
+                <el-col :span="12">
+                  <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+                  <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button>
+                </el-col>
+              </el-row>
+              <el-divider />
             </el-row>
-            <el-divider />
-          </el-row>
-          <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column fixed type="index" label="序号" width="50" align="left" />
-            <el-table-column prop="name" label="限定条件" align="left">
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.name"
-                  size="mini"
-                  style="text-align: center"
-                  placeholder="请输入名称"
-                  :disabled="scope.row.fang"
-                  @blur="handleConditionName(scope.row)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column fixed="right" width="150" label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="
-                    scope.row.fang = false
-                    conditName = scope.row.name
-                  "
-                >编辑
-                </el-button>
-                <el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
-                <el-button type="text" size="mini" @click="catCond(scope.row)">查看条件</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+            <el-table :data="conditionList" element-loading-text="Loading" border fit highlight-current-row stripe>
+              <el-table-column fixed type="index" label="序号" width="50" align="left" />
+              <el-table-column prop="name" label="限定条件" align="left">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.name"
+                    size="mini"
+                    style="text-align: center"
+                    placeholder="请输入名称"
+                    :disabled="scope.row.fang"
+                    @blur="handleConditionName(scope.row)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" width="150" label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="
+                      scope.row.fang = false
+                      conditName = scope.row.name
+                    "
+                  >编辑
+                  </el-button>
+                  <el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
+                  <el-button type="text" size="mini" @click="catCond(scope.row)">查看条件</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
         </div>
         <div>
           <el-row>