heyang

src/views/chemicalManage/inventoryManagement/takeRecord/index.vue

@@ -135,7 +135,7 @@
           <el-table-column label="操作人" prop="outUserName" width="100" show-overflow-tooltip/>
           <el-table-column label="双人认证" prop="content" width="180" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.oneUserName}} {{scope.row.twoUserName}}</span>
+              <span>{{scope.row.outOneUserName}} {{scope.row.outTwoUserName}}</span>
             </template>
           </el-table-column>
         </el-table>

src/views/chemicalManage/purchaseManage/purchaseExamine/infoPage.vue

@@ -112,7 +112,11 @@
               <span class="auditStatusColor-C" v-if="scope.row.nodeStatus==2">{{scope.row.applyStatusStr}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="时间" prop="updateTime" width="250" show-overflow-tooltip/>
+          <el-table-column label="时间" prop="updateTime" width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.updateTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="备注" prop="content" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="scope.row.nodeStatus!=0">{{scope.row.nodeContent}}</div>

src/views/creditViolation/credit/violation/index.vue

@@ -159,12 +159,13 @@
           </el-input>
         </el-form-item>
         <el-form-item label="扣除信用分值：" prop="deductionVal" style="width:600px;" v-if="form.reasonId==-1">
-          <el-input
+          <el-input-number
             v-model="form.deductionVal"
             placeholder="请输入"
+            :min="0"
             maxLength="5"
             @input="getIntegralMatchingRules">
-          </el-input>
+          </el-input-number>
         </el-form-item>
         <el-form-item label="处理方式" prop="checkListTwo">
           <el-form-item label="">
@@ -937,9 +938,10 @@ export default {
     //处罚方式懒加载
     getIntegralMatchingRules(query){
       if (query !== '') {
+        console.log(this.form.deductionVal)
         this.loading = true;
         let obj = {
-          creditScore : this.form.deductionVal
+          creditScore : this.form.deductionVal?this.form.deductionVal:'0'
         };
         getIntegralMatchingRules(obj).then(res => {
           this.loading = false;