修改物料多次选择11

src/views/activiti/applyHome.vue

@@ -7,17 +7,18 @@
     <a-button @click="onSearchProcess('')">重置</a-button>
     <a-button @click="handleToApplyList" type="primary" style="float: right;">前往我的申请列表</a-button>
       <a-empty description="无流程可供选择" v-if="activeKeyAll.length==0" />
-      <div v-else>
+      <div v-else >
         <a-collapse v-model="activeKey">
           <a-collapse-panel v-for="(value, index)  in activeKeyAll" :header="filterDictText(dictOptions,value)||'未分类'" :key="value">
             <a-list :grid="{ gutter: 10,column:4}" :dataSource="processDataMap[value]">
               <a-list-item slot="renderItem" slot-scope="item">
-                <a-card>
+                <a-card hoverable @click="chooseProcess(item)">
                   <div slot="title">
                     <a-row style="text-align: center;">
                      <!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
                       <!--<a-col span="12" style="text-align: center;">-->
-                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>
+                        <a href="javascript:void (0)">{{item.name}}</a>
+<!--                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
                       <!--</a-col>-->
                     </a-row>
                   </div>

src/views/activiti/applyList.vue

@@ -66,13 +66,13 @@
       :scroll="{x: false, y: 470 }"
       @change="handleTableChange">
       <span slot="result" slot-scope="text, r">
-        <span v-if="r.result == 0" style="color: whitesmoke">未提交</span>
+        <span v-if="r.result == 0" style="color: #e78c8c">未提交</span>
         <span v-else-if="r.result==1" style="color: orange">处理中</span>
         <span v-else-if="r.result==2" style="color: green">已通过</span>
         <span v-else-if="r.result==3" style="color: red">已驳回</span>
       </span>
       <span slot="status" slot-scope="text, r">
-        <span v-if="r.status == 0" style="color: whitesmoke">草稿</span>
+        <span v-if="r.status == 0" style="color: #ec7b7b">草稿</span>
         <span v-else-if="r.result==1" style="color: orange">处理中</span>
         <span v-else-if="r.status==2" style="color: blue">已结束</span>
         <span v-else-if="r.status==3" style="color: magenta">已撤回</span>

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -739,8 +739,8 @@
       onSelect(record) {
         // console.log("0出发了",record.row);
         let isEr = true;
-        if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){
-          if( record.row.id !== undefined && record.row.id !== '' && this.isBu !== record.row.materialGroup ){
+        if(!!record.row.materialGroup){
+          if( !!record.row.id  && this.isBu !== record.row.materialGroup ){
             console.log("1出发了",record.row);
             this.isabled = false;
             this.fetchMerchandiseNews(record.row.materialGroup);
@@ -767,7 +767,7 @@
           // }
         }
            // console.log("5555出发了",record.row);
-        if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== '' && record.row.materialNumber !== undefined && isEr){
+        if(!!record.row.materialGroup  && !!record.row.materialNumber  && isEr){
           console.log("2出发了",record.row);
           let materialName = {  }
           // console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList)
@@ -782,7 +782,7 @@
             }
           })
           // console.log(materialName);
-          if(record.row.id !== undefined){
+          if(!!record.row.id ){
             let values = [
               {
                 rowKey: record.row.id,
@@ -790,7 +790,7 @@
                   'materialNumber': record.row.materialNumber,
                   'materialGroup': record.row.materialGroup,
                   // 'materialGroup': this.materialId,
-                  'materialSeries': '',
+                  'materialSeries': record.row.materialSeries,
                   'materialName': materialName.name,
                   'materialUnit': materialName.unit,
                   'supplierId': materialName.supplierId
@@ -802,7 +802,7 @@
           }
         }
 
-        if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
+        if(!!record.row.materialQuantity  && !!record.row.materialPrice ){
           // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
           console.log("3出发了",record.row);
           //如果单价大于5万