Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/public/apiUrl.js

 // 测试环境
-// const VUE_APP_BASE_API = 'http://119.29.37.87:9007' // eslint-disable-line
 const VUE_APP_BASE_API = 'http://1.14.146.148:9002' // eslint-disable-line
+// const VUE_APP_BASE_API = 'http://36.41.67.68:9002' // eslint-disable-line
 // 开发环境
 // const VUE_APP_BASE_API = 'http://106.52.20.189:9002' // eslint-disable-line
 // const VUE_APP_BASE_API = 'http://192.168.0.38:8002' // eslint-disable-line

applications/architecture-dee/public/dee-workflow/chunk-12d55490.f9bd4b0a.js

+(window["webpackJsonp-dee-workflow"]=window["webpackJsonp-dee-workflow"]||[]).push([["chunk-12d55490"],{"13d6":function(e,a,t){var n={"./":"7ca9","./DeeSelectRule":"7e69","./DeeSelectRule.vue":"7e69","./basicInfo":"9891","./basicInfo.vue":"9891","./current-task-owner":"5894","./current-task-owner.vue":"5894","./help-setting":"f006","./help-setting.vue":"f006","./index":"7ca9","./index.js":"7ca9","./moveAndZoom":"750a","./moveAndZoom.js":"750a","./participant-authOrg":"ba31","./participant-authOrg.vue":"ba31","./participant-creator":"7677","./participant-creator.vue":"7677","./participant-group":"c096","./participant-group.vue":"c096","./participant-org":"90ee","./participant-org.vue":"90ee","./participant-pboVar":"11e9","./participant-pboVar.vue":"11e9","./participant-rule":"9ea8","./participant-rule.vue":"9ea8","./participant-starter":"e09c","./participant-starter.vue":"e09c","./participant-team":"c26c","./participant-team.vue":"c26c","./participant-user":"b170","./participant-user.vue":"b170","./participant-var":"8275","./participant-var.vue":"8275","./process-owner":"07eb","./process-owner.vue":"07eb"};function r(e){var a=c(e);return t(a)}function c(e){if(!t.o(n,e)){var a=new Error("Cannot find module '"+e+"'");throw a.code="MODULE_NOT_FOUND",a}return n[e]}r.keys=function(){return Object.keys(n)},r.resolve=c,e.exports=r,r.id="13d6"},"7e69":function(e,a,t){"use strict";t.r(a);var n=function(){var e=this,a=e._self._c;return a("div",{staticClass:"-page"},[a("el-cascader",{attrs:{props:{expandTrigger:"click",lazy:!0,lazyLoad:e.lazyLoad,checkStrictly:!0},options:e.options},on:{change:e.handleChange},model:{value:e.cascaderData,callback:function(a){e.cascaderData=a},expression:"cascaderData"}})],1)},r=[],c=(t("a7e1"),t("a74e")),o=(t("e285"),t("9ebb"),t("df26"),t("42c2")),i=(t("c880"),t("ce9c"),t("8f6b")),p={components:{},props:{value:{type:[Object,Array,String,Number],default:null},itemObj:{type:Object,default:function(){}}},data:function(){return{showCascader:!1,hasObjOptions:!1,cascaderData:"",options:[],hasGetConfigData:!1}},computed:{},watch:{},mounted:function(){this.options.length||this.getFirstOptions()},methods:{getFirstOptions:function(){var e=this;Object(i["c"])({}).then((function(a){e.options=a.items.content?a.items.content.map((function(e){return{label:e.name,value:e.innerName,data:e,leaf:""}})):[]}))},lazyLoad:function(){var e=Object(o["a"])(Object(c["a"])().mark((function e(a,t){var n;return Object(c["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:a&&a.data&&(a.data.children?setTimeout((function(){var e=Array.from(a.data);t(e)})):1===a.level?Object(i["findModelDefByServer"])({modelType:"BASE",serverName:a.value}).then((function(e){var a=e.items.map((function(e){return{value:e.name,label:e.displayName,leaf:"",data:e}}));t(a)})):2===a.level&&(n={indices:["DxDynamicCodeScope"],pageFrom:1,pageSize:10,openProps:[{name:"dynamicCode",pageFrom:1,pageSize:9999,items:[{fieldName:"serverName",operator:"EQ",value:a.parent.value},{fieldName:"modelName",operator:"EQ",value:a.value}]}],searchItems:{operator:"AND",children:[{operator:"AND",items:[{fieldName:"displayName",operator:"EQ",value:"pbo通用作用域"}]}]}},Object(i["getRules"])(n).then((function(e){var a=e.items.content.map((function(e){return{value:e.name,label:e.displayName,leaf:"leaf",data:e}}));t(a)}))));case 1:case"end":return e.stop()}}),e)})));function a(a,t){return e.apply(this,arguments)}return a}(),handleChange:function(e){console.log("vai=======",e)},isObj:function(e){return"[object Object]"===Object.prototype.toString.call(e)}}},u=p,s=t("2be6"),l=Object(s["a"])(u,n,r,!1,null,null,null);a["default"]=l.exports},9891:function(e,a,t){"use strict";t.r(a);var n=function(){var e=this,a=e._self._c;return a("div",{staticClass:"basicInfo-com"},[a("dee-readable-form",{attrs:{"form-data":e.basicInfo}})],1)},r=[],c={name:"BasicInfo",components:{},props:{basicInfo:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{basicInfo:{handler:function(e,a){this.basicInfo=e}}},mounted:function(){},methods:{}},o=c,i=t("2be6"),p=Object(i["a"])(o,n,r,!1,null,null,null);a["default"]=p.exports}}]);
\ No newline at end of file

applications/architecture-dee/src/commonComponents/components/orgLazyLoadSelect/index.vue

@@ -367,6 +367,7 @@ export default {
 <style lang="scss">
 .OrgLazyLoadSelectCmp {
   font-size: 14px;
+  // height: 40px;
   .text-tag{
     .el-tag{
       margin: 0 4px
@@ -374,30 +375,31 @@ export default {
   }
   .content-wrap {
     display: flex;
+    height: 100%;
     align-items: center;
     .text {
       width: auto;
       line-height: 40px;
       height: 40px;
     }
-    // .el-icon-close{
-    //   width: 20px;
-    //   text-align: right;
-    //   cursor: pointer;
-    //   &:hover {
-    //     color: #409eff;
-    //     font-size: 18px;
-    //   }
-    // }
+    .el-icon-close{
+      // width: 20px;
+      // text-align: center;
+      cursor: pointer;
+      // &:hover {
+      //   color: #409eff;
+      //   font-size: 18px;
+      // }
+    }
     .el-icon-edit {
-      width: 20px;
-      text-align: right;
+      // width: 20px;
+      // text-align: center;
       margin-left: 20px;
       cursor: pointer;
-      &:hover {
-        color: #409eff;
-        font-size: 18px;
-      }
+      // &:hover {
+      //   color: #409eff;
+      //   font-size: 18px;
+      // }
     }
   }
 }

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/UploadFiles.vue

+<template>
+  <div class="upload-files">
+    <dee-form label-position="top" :form="form" :form-data="formData1" />
+  </div>
+</template>
+<script>
+export default {
+  name: 'UploadFiles',
+  props: {
+    // 系统配置出来的表单
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      form: {
+        objFileLinks: []
+      },
+      'formData': [
+        {
+          'title': '',
+          'split': 3,
+          'data': [
+            {
+              'name': '上传附件',
+              'key': 'objFileLinks',
+              'parentKey': 'objFileLinks',
+              'component': {
+                'name': 'DeeUploadTable',
+                'url': '/dfs/fileManager/feign/uploadFile'
+              },
+              'width': 3
+            }
+          ],
+          'labelPosition': 'right'
+        }
+      ],
+      formData1: [
+        {
+          'title': '',
+          'split': 3,
+          'appName': 'tf-mom',
+          'data': [
+            {
+              'name': '附件',
+              'title': '',
+              'key': 'objFileLinks',
+              'width': 3,
+              'hidden': false,
+              'component': {
+                'name': 'DeeUploadTable',
+                'appName': 'tf-mom',
+                'taleType': 'single',
+                'showFileList': true,
+                'filterKey': 'contentType',
+                'mlimit': 1,
+                'alimit': 1,
+                'limit': 5,
+                'mrequired': true,
+                'state': 'edit',
+                'masterTitle': '主内容',
+                'appendTitle': '附件',
+                'masterFilter': ['MASTER_FILE', 'PRIMARY'],
+                'appendFilter': ['ATTACH_FILE', 'SECONDARY', 'FLOW_FILE', 'PROCESS_CONTENTROLE_PDF'],
+                'url': '/dfs/fileManager/feign/uploadFile',
+                'masterUploadFilter': 'MASTER_FILE',
+                'appendUploadFilter': 'ATTACH_FILE'
+              },
+              'parentKey': 'objFileLinks',
+              'premMark': true
+            }
+          ]
+        }
+      ]
+    }
+  },
+  watch: {
+    'form.objFileLinks': function(newForm, oldForm) {
+      this.$emit('input', newForm)
+    }
+  },
+  mounted() {
+    const data = this.value
+    this.form.objFileLinks = data
+  },
+  methods: {
+  }
+}
+</script>
+<style lang='scss'>
+.upload-files {
+  .dee-form2 {
+    .el-row {
+      .form-item-container {
+        height: 100% !important;
+        width: 100% !important;
+
+        .el-form-item__content {
+          padding-left: 3.75rem;
+        }
+      }
+    }
+  }
+}
+</style>

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/index.vue

+/**
+* @Description:  检验响应流程
+* @author xioln
+* @date 2023-07-14
+* @FilePath: applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/index.vue
+*/
+<template>
+  <div class="jobResponseInTest-process">
+    <equipmen-check-no v-if="type==='AirEquipment'" :basic-data="basicData" :job-response-in-test-data="data" />
+    <outSource-check-no v-if="type==='OutSource'" :basic-data="basicData" :job-response-in-test-data="data" />
+    <material-check-no v-if="type==='Material'" :basic-data="basicData" :job-response-in-test-data="data" />
+  </div>
+</template>
+<script>
+import EquipmenCheckNo from './component/equipmenCheckNo'
+import OutSourceCheckNo from './component/outSourceCheckNo'
+import MaterialCheckNo from './component/materialCheckNo'
+import { get, post } from '@/utils/http'
+
+export default {
+  componentName: '检验响应流程',
+  name: 'JobResponseInTestProcess', // name写在组件的最前方,自定义组件为必填
+  // components: { EquipmenCheckNo, OutSourceCheckNo },
+  components: { EquipmenCheckNo, OutSourceCheckNo, MaterialCheckNo },
+  props: {
+    basicData: {
+      type: Object,
+      default: () => null
+    }
+  },
+  data() {
+    return {
+      type: '',
+      data: null
+    }
+  },
+  computed: {},
+  watch: {
+    // basicData: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler: function(val) {
+    //     if (val.inventoryReqId) {
+    //       console.log('val', val)
+    //       // this.getInventoryRequest(val.inventoryReqId)
+    //     }
+    //   }
+    // },
+    'basicData.inventoryReqId': {
+      immediate: true,
+      deep: true,
+      handler: function(val) {
+        console.log('inventoryReqId', val)
+        this.getInventoryRequest(val)
+      }
+    }
+  },
+  created() {
+    // 初始化数据
+  },
+  mounted() {
+    console.log('basicData', this)
+  },
+  methods: {
+    getInventoryRequest(id) {
+      get(`InventoryRequest/${id}`).then(res => {
+        console.log('getInventoryRequest', res)
+        const type = res.items.billType
+        // switch (type) {
+        //   case '器材':
+        //   case 'Material':
+        //     this.type = 'Material'
+        //     break
+        //   case '机载设备':
+        //   case 'AirEquipment':
+        //     this.initData('AirEquipment')
+        //     break
+        //   case '外包产品':
+        //   case 'OutSource':
+        //     this.initData('OutSource')
+        //     break
+        // }
+        this.initData(type)
+      }).catch((err) => {
+        console.log(err)
+      })
+    },
+    initData(type) {
+      const param = {
+        'pageFrom': 1,
+        'pageSize': 10,
+        'searchItems': {
+          'children': [
+            {
+              'items': [
+                {
+                  'fieldName': 'jobOrderId',
+                  'operator': 'EQ',
+                  'value': this.basicData.id
+                }
+              ],
+              'operator': 'AND'
+            }
+          ],
+          'items': [],
+          'operator': 'AND'
+        },
+        'openProps': [
+          {
+            'name': 'jobTestCheckItems',
+            'openProps': [{ 'name': 'jobTestCheckItemDetails' }]
+          },
+          {
+            'name': 'objFileLinks',
+            'openProps': [{ 'name': 'target' }]
+          }
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
+      }
+      post('JobResponseInTest/search', param).then(res => {
+        const data = res.items.content[0]
+        console.log('JobResponseInTest', { ...data })
+        this.data = data
+        this.type = type
+      }).catch((err) => {
+        console.log(err)
+      })
+    }
+  }
+}
+</script>
+<style lang='scss'>
+</style>

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue

@@ -14,16 +14,13 @@
       :form-data="formData"
       :rules="rules"
       @on-submit="submit"
-      @on-cancel="cancel"
     />
     <div class="sub-title"> 采购入库申请明细 </div>
     <dee-table
       ref="treeTable"
-      :key="symbolKey"
       :data="tableData"
       :columns="columns"
       :options="optionsTree"
-      :index-row="{ title: '序号', width: '70', align: 'center' }"
     >
       <div slot="header" class="table-title-wrap">
         <dee-tools :tools="tools" mode="normal" />
@@ -245,7 +242,10 @@ export default {
         rowKey: 'rowId',
         'tree-props': { children: 'children' }
       },
+      num: 1,
+      childNum: 1,
       columns: [
+        { title: '序号', key: 'parentIndex', align: 'center', headerAlign: 'center' },
         {
           title: '操作', minWidth: 120, align: 'center', component: {
             name: 'EditTableRow',
@@ -381,8 +381,7 @@ export default {
       tableData: [],
       tableParam: [],
       operator: null,
-      addData: {},
-      symbolKey: ''
+      addData: {}
     }
   },
   computed: {
@@ -661,7 +660,10 @@ export default {
             item.component.disabled = true
           })
         }
-        this.tableData = data
+        this.treeTableNoArrange(data)
+
+        this.num = 1
+        this.childNum = 1
       }).catch((err) => {
         console.log(err)
       })
@@ -708,12 +710,7 @@ export default {
       if (tableDataItem.operateType === 'NEW') {
         tableData.push(tableDataItem)
       }
-      console.log('tableData', tableData)
-      tableData.forEach(item => {
-        this.tableData.push(item)
-      })
-      this.symbolKey = Symbol(new Date().toString())
-      console.log('this.symbolKey', this.symbolKey)
+      this.treeTableNoArrange(tableData)
     },
     submit() {
       const tableData = this.tableData.slice()
@@ -757,8 +754,16 @@ export default {
         console.log(err)
       })
     },
-    cancel() {
-
+    treeTableNoArrange(tableData) {
+      tableData.forEach((item, i) => {
+        item.parentIndex = i + 1
+        if (item.children) {
+          item.children.forEach((child, j) => {
+            child.parentIndex = item.parentIndex + '.' + (j + 1)
+          })
+        }
+      })
+      this.tableData = tableData
     }
   }
 }

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess/index.vue

@@ -11,7 +11,6 @@
       :data="tableData"
       :columns="columns"
       :options="optionsTree"
-      :index-row="{ title: '序号', width: '70' , align: 'center'}"
     />
   </div>
 </template>
@@ -32,65 +31,66 @@ export default {
     return {
       tableData: [],
       columns: [
-        { title: '单据编号', key: 'inventoryReq.reqNo', width: '120', headerAlign: 'center' },
-        { title: '所属设备', key: 'subEquipment', headerAlign: 'center' },
+        { title: '序号', key: 'parentIndex', align: 'center', headerAlign: 'center' },
+        { title: '单据编号', key: 'inventoryReq.reqNo', width: '120', align: 'center', headerAlign: 'center' },
+        { title: '所属设备', key: 'subEquipment', headerAlign: 'center', align: 'center' },
         {
-          title: '物料类型', key: 'typeName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '物料类型', key: 'typeName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.extMaterial ? row.extMaterial.resType2.typeName : row.materialTypeName
             return value
           }
         },
         {
-          title: '编码', key: 'typeCode', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
+          title: '编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
             const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
             return value
           }
         },
-        { title: '机型', key: 'airModel', headerAlign: 'center' },
-        { title: '架次', key: 'sorties', headerAlign: 'center' },
+        { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
+        { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
         {
-          title: '计量单位', key: 'unitName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
             return value
           }
         },
-        { title: '入库数量', key: 'reqAmount', headerAlign: 'center' },
+        { title: '入库数量', key: 'reqAmount', align: 'center', headerAlign: 'center' },
         {
-          title: '供应商', key: 'supplierFullName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '供应商', key: 'supplierFullName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.extDxSipplier ? row.extDxSipplier.supplierFullName : row.supplier
             return value
           }
         },
         // { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' },
-        { title: '制造商', key: 'manufacturer', headerAlign: 'center' },
-        { title: '到货日期', key: 'arrivalDate', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+        { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
+        { title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
           return row.arrivalDate.split(' ')[0]
         } },
-        { title: '生产日期', key: 'producedTime', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+        { title: '生产日期', key: 'producedTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
           return row.arrivalDate.split(' ')[0]
         } },
         {
-          title: '随产品资料', key: 'withProductMaterial', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+          title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial
           }
         },
-        { title: '紧急程度', key: 'urgency', headerAlign: 'center' },
-        { title: '入库单价', key: 'stockUnitPrice', headerAlign: 'center' },
-        { title: '入库金额', key: 'stockPrice', headerAlign: 'center' },
-        { title: '含税单价', key: 'taxUnitPrice', headerAlign: 'center' },
-        { title: '含税金额', key: 'taxPrice', headerAlign: 'center' },
-        { title: '税率', key: 'taxRate', headerAlign: 'center' },
-        { title: '报检人', key: 'applyUserName', headerAlign: 'center' },
+        { title: '紧急程度', key: 'urgency', align: 'center', headerAlign: 'center' },
+        { title: '入库单价', key: 'stockUnitPrice', align: 'center', headerAlign: 'center' },
+        { title: '入库金额', key: 'stockPrice', align: 'center', headerAlign: 'center' },
+        { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },
+        { title: '含税金额', key: 'taxPrice', align: 'center', headerAlign: 'center' },
+        { title: '税率', key: 'taxRate', align: 'center', headerAlign: 'center' },
+        { title: '报检人', key: 'applyUserName', align: 'center', headerAlign: 'center' },
         {
-          title: '接受仓库', key: 'extname', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '接受仓库', key: 'extname', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.storageZone ? row.storageZone.extname : row.storageZoneName
             return value
           }
         },
-        { title: '合同号', key: 'contractNo', headerAlign: 'center' },
-        { title: '备注', key: 'remark', headerAlign: 'center' },
-        { title: '状态', key: 'state', headerAlign: 'center' },
-        { title: '创建时间', key: 'createTime', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+        { title: '合同号', key: 'contractNo', align: 'center', headerAlign: 'center' },
+        { title: '备注', key: 'remark', align: 'center', headerAlign: 'center' },
+        { title: '状态', key: 'state', align: 'center', headerAlign: 'center' },
+        { title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
           return row.arrivalDate.split(' ')[0]
         } }
       ],
@@ -102,20 +102,17 @@ export default {
   },
   computed: {},
   watch: {
-    basicData: {
+    'basicData.businessObject.id': {
       immediate: true,
       deep: true,
       handler: function(val) {
-        console.log('val', val)
-        if (val.businessObject.id) {
-          this.searchInStorageRequestItem(val.businessObject.id)
-        }
+        this.searchInStorageRequestItem(val)
       }
     }
   },
   created() {
     // 初始化数据
-    console.log('this.ba', this.basicData)
+    // this.searchInStorageRequestItem(this.basicData.businessObject.id)
   },
   methods: {
     // 编辑采购入库明细查询InStorageRequestItem/search
@@ -187,10 +184,21 @@ export default {
 
       post('InStorageRequestItem/treeSearch', param).then(res => {
         const data = res.items
-        this.tableData = data
+        this.treeTableNoArrange(data)
       }).catch((err) => {
         console.log(err)
       })
+    },
+    treeTableNoArrange(tableData) {
+      tableData.forEach((item, i) => {
+        item.parentIndex = i + 1
+        if (item.children) {
+          item.children.forEach((child, j) => {
+            child.parentIndex = item.parentIndex + '.' + (j + 1)
+          })
+        }
+      })
+      this.tableData = tableData
     }
   }
 }