Merge remote-tracking branch 'origin/master'

# Conflicts:
#	itdmWeb/package.json
#	itdmWeb/src/main.js

itdmWeb/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8080/itdmServer
+VUE_APP_API_BASE_URL=http://10.10.0.106:8082/itdmServer
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

itdmWeb/src/views/activiti/ActivitiFileList.vue

@@ -66,146 +66,146 @@
 
 <script>
 
-  import { getAction, deleteAction } from '@/api/manage'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ActivitiFileModel from './ActivitiFileModel'
-  import { getModelList } from '@/api/activiti/activiti'
+import { getAction, deleteAction } from '@/api/manage'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ActivitiFileModel from './ActivitiFileModel'
+import { getModelList } from '@/api/activiti/activiti'
 
-  export default {
-    name: 'ActivitiFileList',
-    mixins: [JeecgListMixin, mixinDevice],
-    components: {
-      ActivitiFileModel
-    },
-    data() {
-      return {
-        columns: [
-          {
-            title: '序号',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1
-            }
-          }, {
-            dataIndex: 'deploymentId',
-            title: '流程编号',
-            align: 'center'
-          }, {
-            dataIndex: 'name',
-            title: '流程名称',
-            align: 'center'
-          }, {
-            dataIndex: 'key',
-            title: '流程KEY',
-            align: 'center'
-          }, {
-            dataIndex: 'description',
-            title: '描述信息',
-            align: 'center'
-          }, {
-            title: '是否挂起',
-            dataIndex: 'suspensionState',
-            align: 'center',
-             scopedSlots: { customRender: 'suspensionState' }
-          }, {
-            title: '部署时间',
-            dataIndex: 'deployTime',
-            align: 'center'
-          }, {
-            title: '操作',
-            dataIndex: 'action',
-            width: '150px',
-            align: 'center',
-            scopedSlots: { customRender: 'action' }
-          }],
-        url: {
-          list: '/act/reprocdef/list',
-          delete: '/act/reprocdef/deleteByDeploymentId',
-          convertToModel: '/act/reprocdef/convertToModel',
-          updateHandle: '/act/reprocdef/update'
-        },
-        queryParam: {
-          category: '',
-          key: '',
-          name: ''
+export default {
+  name: 'ActivitiFileList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ActivitiFileModel
+  },
+  data() {
+    return {
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          dataIndex: 'deploymentId',
+          title: '流程编号',
+          align: 'center'
+        }, {
+          dataIndex: 'name',
+          title: '流程名称',
+          align: 'center'
+        }, {
+          dataIndex: 'key',
+          title: '流程KEY',
+          align: 'center'
+        }, {
+          dataIndex: 'description',
+          title: '描述信息',
+          align: 'center'
+        }, {
+          title: '是否挂起',
+          dataIndex: 'suspensionState',
+          align: 'center',
+          scopedSlots: { customRender: 'suspensionState' }
+        }, {
+          title: '部署时间',
+          dataIndex: 'deployTime',
+          align: 'center'
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          width: '150px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }],
+      url: {
+        list: 'act/reprocdef/list',
+        delete: '/act/reprocdef/deleteByDeploymentId',
+        convertToModel: '/act/reprocdef/convertToModel',
+        updateHandle: '/act/reprocdef/update'
+      },
+      queryParam: {
+        category: '',
+        key: '',
+        name: ''
+      }
+    }
+  },
+  created() {
+    // this.getDataList()
+  },
+  methods: {
+    // 删除
+    actDelete(deploymentId) {
+      deleteAction(this.url.delete, { deploymentId: deploymentId }).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.searchQuery()
+        } else {
+          this.$message.warning(res.message)
         }
-       }
+      })
     },
-   created() {
-     // this.getDataList()
-   },
-   methods: {
-     // 删除
-     actDelete(deploymentId) {
-        deleteAction(this.url.delete, { deploymentId: deploymentId }).then(res => {
-            if (res.success) {
-              this.$message.success(res.message)
-              this.searchQuery()
-            } else {
-              this.$message.warning(res.message)
-            }
-        })
-     },
-     // 转为模型
-     convertToModel(id) {
-       getAction(this.url.convertToModel, { id: id }).then(res => {
-         console.log('转为模型', res)
+    // 转为模型
+    convertToModel(id) {
+      getAction(this.url.convertToModel, { id: id }).then(res => {
+        console.log('转为模型', res)
         if (res.success) {
           this.$message.success('操作成功，流程编号:' + res.result.deploymentId)
-           this.searchQuery()
+          this.searchQuery()
         } else {
           this.$message.warning('操作失败，流程编号:' + res.result.deploymentId)
         }
-       })
-     },
-     // 挂起和激活
-     updateHandle(id, state) {
-       getAction(this.url.updateHandle, { id: id, state: state }).then(res => {
-         console.log('挂起和激活', res)
-         if (res.success) {
-           this.$message.success(res.message)
-            this.searchQuery()
-         } else {
-           this.$message.warning(res.message)
-         }
-       })
-     },
-      // 查询
-      getDataList() {
-       this.loading = true
-        let params = this.queryParam
-        getModelList(this.url.list, params).then(res => {
-          console.log('查询数据', res)
-          this.dataSource = res.result.records
-          this.total = res.result.total
-          this.ipagination.total = res.result.total
-          this.loading = false
-        })
-      },
-     openModeler() {
-          this.$refs.ativitiFileModel.openModel()
-       },
+      })
+    },
+    // 挂起和激活
+    updateHandle(id, state) {
+      getAction(this.url.updateHandle, { id: id, state: state }).then(res => {
+        console.log('挂起和激活', res)
+        if (res.success) {
+          this.$message.success(res.message)
+          this.searchQuery()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 查询
+    getDataList() {
+      this.loading = true
+      let params = this.queryParam
+      getModelList(this.url.list, params).then(res => {
+        console.log('查询数据', res)
+        this.dataSource = res.result.records
+        this.total = res.result.total
+        this.ipagination.total = res.result.total
+        this.loading = false
+      })
+    },
+    openModeler() {
+      this.$refs.ativitiFileModel.openModel()
+    },
 
-      deployProcess(id) {
-        getAction(this.url.deploy, { id: id }).then(res => {
-          if (res.success) {
-            this.$message.success(res.message)
-             this.searchQuery()
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-      }
+    deployProcess(id) {
+      getAction(this.url.deploy, { id: id }).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.searchQuery()
+        } else {
+          this.$message.error(res.message)
+        }
+      })
     }
-   }
+  }
+}
 </script>
 
 <style lang="less" scoped>
- .table-operator .ant-btn {
-        margin: 3px 8px 4px 0;
-    }
+.table-operator .ant-btn {
+  margin: 3px 8px 4px 0;
+}
 </style>

itdmWeb/src/views/activiti/ActivitiList.vue

@@ -39,6 +39,8 @@
         <span slot="action" slot-scope="text, record">
           <a href="javascript:;" @click="openModeler(record)">流程</a>
           <a-divider type="vertical"/>
+          <a href="javascript:;" @click="handleDetail1(record)">查看流程</a>
+          <br>
           <a-dropdown>
             <a class="ant-dropdown-link">
               更多 <a-icon type="down"/>
@@ -66,6 +68,8 @@
 
       <activiti-model-modal ref="modalForm" @ok="modalFormOk" @getModels="getModels"></activiti-model-modal>
       <activiti-model ref="activitiModel" @ok="modalFormOk" ></activiti-model>
+      <pic-form ref="picForm" @ok="modalFormOk" ></pic-form>
+      <pic-modal ref="picModel" @ok="modalFormOk" ></pic-modal>
     </a-card>
   </div>
 
@@ -79,11 +83,15 @@
   import ActivitiModelModal from './ActivitiModelModal'
   import { getModelList } from '@/api/activiti/activiti'
   import ActivitiModel from './ActivitiModel'
+  import PicModal from "@views/activiti/PicModel";
+  import PicForm from "@views/activiti/PicForm";
 
   export default {
     name: 'ActivitiList',
     mixins: [JeecgListMixin, mixinDevice],
     components: {
+      PicForm,
+      PicModal,
       ActivitiModelModal, ActivitiModel
     },
     data() {
@@ -160,7 +168,12 @@
      },
      openModeler(row) {
           this.$refs.activitiModel.openModel(row)
-       },
+     },
+     handleDetail1:function(record){
+       this.$refs.picForm.edit(record);
+       this.$refs.picForm.title="流程";
+       this.$refs.picForm.disableSubmit = true;
+     },
       // 查询
       getModels() {
         let param = this.q

itdmWeb/src/views/examples/form/BasicForm.vue

@@ -1,114 +1,126 @@
 <template>
-  <a-card :body-style="{padding: '24px 32px'}" :bordered="false">
-    <a-form @submit="handleSubmit" :form="form">
-      <a-form-item
-        label="标题"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-input
-          v-decorator="[
+  <a-modal
+    title="流程图"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-card :body-style="{padding: '24px 32px'}" :bordered="false">
+      <a-form @submit="handleSubmit" :form="form">
+        <a-form-item
+          label="标题"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+          <a-input
+            v-decorator="[
             'name',
             {rules: [{ required: true, message: '请输入标题' }]}
           ]"
-          name="name"
-          placeholder="给目标起个名字" />
-      </a-form-item>
-      <a-form-item
-        label="起止日期"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-range-picker
-          name="buildTime"
-          style="width: 100%"
-          v-decorator="[
+            name="name"
+            placeholder="给目标起个名字" />
+        </a-form-item>
+        <a-form-item
+          label="起止日期"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+          <a-range-picker
+            name="buildTime"
+            format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD"
+            style="width: 100%"
+            v-decorator="[
             'buildTime',
             {rules: [{ required: true, message: '请选择起止日期' }]}
           ]" />
-      </a-form-item>
-      <a-form-item
-        label="目标描述"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-textarea
-          rows="4"
-          placeholder="请输入你阶段性工作目标"
-          v-decorator="[
+        </a-form-item>
+        <a-form-item
+          label="目标描述"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+          <a-textarea
+            rows="4"
+            placeholder="请输入你阶段性工作目标"
+            v-decorator="[
             'description',
             {rules: [{ required: true, message: '请输入目标描述' }]}
           ]" />
-      </a-form-item>
-      <a-form-item
-        label="衡量标准"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-textarea
-          rows="4"
-          placeholder="请输入衡量标准"
-          v-decorator="[
+        </a-form-item>
+        <a-form-item
+          label="衡量标准"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+          <a-textarea
+            rows="4"
+            placeholder="请输入衡量标准"
+            v-decorator="[
             'type',
             {rules: [{ required: true, message: '请输入衡量标准' }]}
           ]" />
-      </a-form-item>
-      <a-form-item
-        label="客户"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-input 
-          placeholder="请描述你服务的客户，内部客户直接 @姓名／工号"
-          v-decorator="[
+        </a-form-item>
+        <a-form-item
+          label="客户"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+          <a-input
+            placeholder="请描述你服务的客户，内部客户直接 @姓名／工号"
+            v-decorator="[
             'customer',
             {rules: [{ required: true, message: '请描述你服务的客户' }]}
           ]" />
-      </a-form-item>
-      <a-form-item
-        label="邀评人"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-      >
-        <a-input placeholder="请直接 @姓名／工号，最多可邀请 5 人" />
-      </a-form-item>
-      <a-form-item
-        label="权重"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-      >
-        <a-input-number :min="0" :max="100" />
-        <span> %</span>
-      </a-form-item>
-      <a-form-item
-        label="目标公开"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-        help="客户、邀评人默认被分享"
-      >
-        <a-radio-group v-model="value">
-          <a-radio :value="1">公开</a-radio>
-          <a-radio :value="2">部分公开</a-radio>
-          <a-radio :value="3">不公开</a-radio>
-        </a-radio-group>
-        <a-form-item>
-          <a-select mode="multiple" v-if="value === 2">
-            <a-select-option value="4">同事一</a-select-option>
-            <a-select-option value="5">同事二</a-select-option>
-            <a-select-option value="6">同事三</a-select-option>
-          </a-select>
         </a-form-item>
-      </a-form-item>
-      <a-form-item
-        :wrapperCol="{ span: 24 }"
-        style="text-align: center"
-      >
-        <a-button htmlType="submit" type="primary">提交</a-button>
-        <a-button style="margin-left: 8px">保存</a-button>
-      </a-form-item>
-    </a-form>
-  </a-card>
+        <a-form-item
+          label="邀评人"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+          :required="false"
+        >
+          <a-input placeholder="请直接 @姓名／工号，最多可邀请 5 人" />
+        </a-form-item>
+        <a-form-item
+          label="权重"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+          :required="false"
+        >
+          <a-input-number :min="0" :max="100" />
+          <span> %</span>
+        </a-form-item>
+        <a-form-item
+          label="目标公开"
+          :labelCol="{lg: {span: 7}, sm: {span: 7}}"
+          :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+          :required="false"
+          help="客户、邀评人默认被分享"
+        >
+          <a-radio-group v-model="value">
+            <a-radio :value="1">公开</a-radio>
+            <a-radio :value="2">部分公开</a-radio>
+            <a-radio :value="3">不公开</a-radio>
+          </a-radio-group>
+          <a-form-item>
+            <a-select mode="multiple" v-if="value === 2">
+              <a-select-option value="4">同事一</a-select-option>
+              <a-select-option value="5">同事二</a-select-option>
+              <a-select-option value="6">同事三</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-form-item>
+        <a-form-item
+          :wrapperCol="{ span: 24 }"
+          style="text-align: center"
+        >
+          <a-button htmlType="submit" type="primary">提交</a-button>
+          <a-button style="margin-left: 8px">保存</a-button>
+        </a-form-item>
+      </a-form>
+    </a-card>
+  </a-modal>
+
 </template>
 
 <script>
+  import { getModelList } from '@/api/activiti/activiti'
   export default {
     name: 'BaseForm',
     data () {
@@ -118,21 +130,57 @@
 
         // form
         form: this.$form.createForm(this),
-
+        ModalText: 'Content of the modal',
+        visible: false,
+        confirmLoading: false,
+        url: {
+          commit: 'xiaoetong/saveForm'
+        }
       }
     },
     methods: {
-
+      aaa(){
+        alert(1)
+        this.visible = true;
+      },
+      handleOk(e) {
+        this.ModalText = 'The modal will be closed after two seconds';
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 2000);
+      },
+      handleCancel(e) {
+        console.log('Clicked cancel button');
+        this.visible = false;
+      },
       // handler
       handleSubmit (e) {
         e.preventDefault()
         this.form.validateFields((err, values) => {
           if (!err) {
             // eslint-disable-next-line no-console
-            console.log('Received values of form: ', values)
+            //console.log('Received values of form: ', values)
+             this.loading = true;
+            let p = {};
+            p.name = values.name;
+            p.description = values.description;
+            p.type = values.type;
+            p.start = values.buildTime[0];
+            p.end = values.buildTime[1];
+            getModelList(this.url.commit, p).then(res => {
+              //console.log('查询数据', res);
+              this.loading = false;
+            })
           }
         })
       }
     }
   }
-</script>
+</script>
+<style lang="less" scoped>
+/deep/.ant-modal {
+  width: 40% !important;
+}
+</style>

itdmWeb/src/views/module-iTDM/gongdandetail/ItdmGongdanDetailList.vue

@@ -14,7 +14,7 @@
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="委托编号">
-              <j-search-select-tag placeholder="请选择委托编号"  ref="woNo" :dictOptions="weituoNoList" @change="handlewnChange" />
+              <j-search-select-tag placeholder="请选择委托编号"  ref="woNo" v-model="queryParam.woNo" :dictOptions="weituoNoList" @change="handlewnChange" />
             </a-form-item>
           </a-col>
 

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "iTDM-web6.2",
+  "name": "iTDM-web",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {}