Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

8 小时以前 2365a272f1883143294cc36b10e62d4a240e7df6

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -22,14 +22,10 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请部门：">
              <el-select disabled
                         v-model="form.approveDeptId"
                         placeholder="选择部门">
                <el-option v-for="user in productOptions"
                           :key="user.deptId"
                           :label="user.deptName"
                           :value="user.deptId" />
              </el-select>
              <el-input v-model="form.approveDeptName"
                        placeholder=""
                        clearable
                        disabled />
            </el-form-item>
          </el-col>
        </el-row>
@@ -45,6 +41,18 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="Number(props.approveType) === 4">
          <el-col :span="24">
            <el-form-item label="报销金额：">
              <el-input-number v-model="form.price"
                               disabled
                               :min="0"
                               :precision="2"
                               style="width: 100%"
                               placeholder="" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <!-- 报价审批：展示报价详情（复用销售报价"查看详情对话框"内容结构） -->
      <div v-if="isQuotationApproval"