Merge remote-tracking branch 'origin/dev' into dev

src/views/activiti/applyList.vue

@@ -162,6 +162,7 @@
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>
 <!--       -->
     </a-modal>
@@ -238,6 +239,7 @@
             title: '标题',
             align:"left",
             dataIndex: 'title',
+            align:"center",
             scopedSlots: { customRender: 'logContent' },
             sorter: true
           },
@@ -334,6 +336,7 @@
           hieg: false,
           procInstId:'',
           pictureId:'',
+          itemId:'',
         },
         form:{
           priority:0,
@@ -494,6 +497,7 @@
         isView = isView||false;
         this.lcModa.disabled = isView;
         this.lcModa.hieg = isView;
+        this.lcModa.itemId=r.tableId
         this.lcModa.title = '修改流程业务信息：'+r.title;
         if (isView) this.lcModa.title = '查看流程业务信息：'+r.title;
         this.lcModa.formComponent = this.getFormComponent(r.routeName).component;

src/views/activiti/doneManage.vue

@@ -125,6 +125,7 @@
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
   </div>
@@ -176,6 +177,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -201,6 +203,9 @@ export default {
       });
     },
     removeHtmlStyle(str) {
+      if (!str){
+        return;
+      }
       str = str.replace(/<\/?[^>]*>/g, '');       //匹配所有html标签
 
       str = str.replace(/<p[^>]*>/g, '<p class="tag-class">'); //去除标签内所有属性，并设置自定义类名
@@ -237,6 +242,7 @@ export default {
         return;
       }
       this.lcModa.disabled = true
+      this.lcModa.itemId=r.tableId
       this.lcModa.title = '查看流程业务信息：' + r.processName
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component
       this.lcModa.processData = r

src/views/activiti/form/ProcessMaterialWarehousing.vue

@@ -68,6 +68,9 @@
     },
     created() {
       console.log(this.itemId,"this.itemId")
+      if (this.itemId){
+        this.isTable=true
+      }
       this.$route.query.item=this.itemId
     },
     methods: {

src/views/activiti/form/ProcessUdgetPlan.vue

@@ -119,7 +119,9 @@
     //   }
     // },
     created() {
-      console.log(this.itemId,"this.itemId")
+      if (this.itemId){
+        this.isTable=true
+      }
        this.$route.query.item=this.itemId
     },
     methods: {

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -10,11 +10,6 @@
               <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8" v-show="false">
-            <a-form-item label="归口部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['putUnder']" placeholder="" style="width: 100%"/>
-            </a-form-item>
-          </a-col>
           <a-col :span="8">
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" disabled/>
@@ -36,6 +31,11 @@
                       date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
             </a-form-item>
           </a-col>
+          <a-col :span="8" >
+            <a-form-item label="归口部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['putUnder']" placeholder="" style="width: 100%" disabled=""/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType',validatorRules.materialType]"
@@ -124,17 +124,17 @@
               <template v-slot:title="props">
                 <p v-for="(item,index) in historyBigId" :key="index">历史价格：{{ item }}</p>
               </template>
-              <a-button @mouseenter="chaKan(props)">查看</a-button>
+              <a-button @mouseenter="chaKan(props)" v-has="'udgePalan:view'">查看</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
           <template v-slot:actionPrice="props">
             <a-tooltip placement="top">
               <template v-slot:title="props">
-                <p v-for="(item,index) in historyPrices" :key="index">历史价格：{{ item.price }} 历史数量：{{item.quantity}}
+                <p v-for="(item,index) in historyPrices" :key="index" >历史价格：{{ item.price }} 历史数量：{{item.quantity}}
                   修改人：{{item.createBy_dictText}}</p>
               </template>
-              <a-button @mouseenter="seeHistoryPrice(props)">记录</a-button>
+              <a-button @mouseenter="seeHistoryPrice(props)" v-has="'udgePalan:hisotoryPrice'">记录</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
@@ -144,7 +144,7 @@
               <template v-slot:title="props">
                 库存数：{{ wateNumber }}
               </template>
-              <a-button @mouseenter="seeWateNumber(props)">库存</a-button>
+              <a-button @mouseenter="seeWateNumber(props)" v-has="'udgePalan:stock'">库存</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
@@ -1190,6 +1190,7 @@
 
       },
       selectChang(val) {
+        console.log(val,"-----99956568989859")
         if (val == 1) {
           this.isIfInspection = true
         } else {
@@ -1331,7 +1332,7 @@
               }
               if (formData.planType == 1 && formData.materialType != 6) {
                 console.log('格式化后的数据', formData)
-                if (formData.ifDirect == null) {
+                if (formData.ifDirect == null && this.routePlanName == '采购员') {
                   this.$message.error('请选择是否属于直达物资!')
                   return
                 } else {
@@ -1383,7 +1384,7 @@
 
         }
         console.log(this.data, '数据回显')
-        let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital', 'ifDirect', 'ifInspection')
+        let fieldval = pick(this.data, 'id','putUnder', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital', 'ifDirect', 'ifInspection')
         this.$nextTick(() => {
           this.assigneesText = this.data.materialType
           this.form.setFieldsValue(fieldval)
@@ -1556,7 +1557,7 @@
               }
               if (formData.planType == 1 && formData.materialType != 6) {
                 console.log('格式化后的数据', formData)
-                if (formData.ifDirect == null) {
+                if (formData.ifDirect == null && this.routePlanName == '采购员') {
                   this.$message.error('请选择是否属于直达物资!')
                   return
                 } else {

src/views/activiti/historicDetail.vue

@@ -153,6 +153,9 @@ export default {
       this.getDataList();
     },
     removeHtmlStyle(str) {
+      if (!str){
+        return ;
+      }
       str = str.replace(/<\/?[^>]*>/g, '');       //匹配所有html标签
 
       str = str.replace(/<p[^>]*>/g, '<p class="tag-class">'); //去除标签内所有属性，并设置自定义类名

src/views/activiti/processFinishManage.vue

@@ -136,6 +136,7 @@
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
   </div>
@@ -156,6 +157,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -231,6 +233,7 @@ export default {
         return;
       }
       console.log(r.id,'查看数据********')
+      this.lcModa.itemId=r.tableId
       this.lcModa.disabled = true;
       this.lcModa.title = '查看流程业务信息：'+r.name;
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component;

src/views/activiti/processInsManage.vue

@@ -138,6 +138,7 @@
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew"  :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
     <a-modal title="流程操作记录" v-model="operatingRecord" :mask-closable="false" :width="'80%'" :footer="null">
@@ -159,6 +160,7 @@ export default {
     return {
       openSearch: true,
       openTip: true,
+
       loading: true, // 表单加载状态
       selectCount: 0, // 多选计数
       selectList: [], // 多选数据
@@ -197,6 +199,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -290,6 +293,7 @@ export default {
         );
         return;
       }
+      this.lcModa.itemId=r.tableId
       this.lcModa.disabled = true;
       this.lcModa.title = '查看流程业务信息：'+r.name;
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component;

src/views/dashboard/HomePage.vue

@@ -347,7 +347,7 @@ export default {
 
 </script>
 <style scoped>
-@import url("/src/css/ali.css");
+@import url("/src/assets/css/ali.css");
 
 
 .bottom-card span {

vue.config.js

@@ -96,7 +96,7 @@ module.exports = {
           '/jeecg-boot': ''  //默认所有请求都加了前缀，需要去掉
         }
       }, */
-      '/jeecg-boot': {
+      '/hy-boot': {
         target: 'http://localhost:9566', // 请求本地 需要后台项目
         ws: false,
         changeOrigin: true