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

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

@@ -70,7 +70,6 @@ export default {
       this.selection = val
     },
     submitEvent() {
-      console.log(this.selection)
       const selection = this.selection.filter(r => {
         if (!this.basicData.inStorageRequestItems) {
           return true

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

@@ -44,8 +44,11 @@ export default {
       const row = data.row
       const form = {
         aircraftType: { defName: row.source.aircraftType.defName },
+        aircraftTypeId: row.source.aircraftType.id,
         aircraftSorties: { defName: row.source.defName },
-        soritesType: { type: row.target.type }
+        aircraftSortiesId: row.source.id,
+        soritesType: { type: row.target.type },
+        soritesTypeId: row.target.id
       }
       this.form = form
     }

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

 /**
-* @Description:  召回出库物料明细
+* @Description:  返厂出库物料明细
 * @author xioln
 * @date 2023-08-02
 */

applications/dee-mes/src/privateComponents/components/OutStorageOfferDetail/components/addOutStorageOfferDetailDialog.vue

@@ -20,7 +20,7 @@
       <el-form-item class="foot-btn-box">
         <el-button type="primary" @click="submitEvent(true)">添加</el-button>
         <el-button type="primary" @click="submitEvent(false)">确认</el-button>
-        <el-button @click.native="cancelEvent">取消</el-button>
+        <el-button @click="diaCancel">取消</el-button>
       </el-form-item>
     </el-form>
 
@@ -91,7 +91,7 @@ export default {
         }
       })
     },
-    cancelEvent() {
+    diaCancel() {
       this.$emit('cancel')
     }
   }

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

@@ -15,8 +15,8 @@
     >
       <dee-tools slot="header" :tools="tools" mode="normal" :collapse="false" />
     </dee-table>
-    <dee-dialog width="70%" title="添加供外出库申请明细" :visible.sync="dialogVisible" @on-cancel="cancel">
-      <addOutStorageOfferDetailDialog ref="addOffer" :basic-data="form" @submitEvent="addData" />
+    <dee-dialog width="70%" title="添加供外出库申请明细" :visible.sync="dialogVisible" @on-cancel="addCancel">
+      <addOutStorageOfferDetailDialog ref="addOffer" :basic-data="form" @submitEvent="addData" @cancel="addCancel" />
     </dee-dialog>
     <dee-dialog width="70%" title="调整占用" :visible.sync="aoDialogVisible" @on-cancel="aoCancel">
       <OutStorageOfferAdjustOccupy ref="adjustOffer" :select-datas="selectTableData" :form="form" @submitEvent="addData" @refreshResponses="refreshResponses" />
@@ -121,7 +121,7 @@ export default {
         }
       },
       {
-        name: '保存占用',
+        name: '占用',
         icon: '/icons/c-creatBook.png',
         handler: {
           click: () => {
@@ -205,7 +205,7 @@ export default {
     handleSelectionChange(v) {
       this.selectTableData = v
     },
-    cancel() {
+    addCancel() {
       this.dialogVisible = false
     },
     aoCancel() {

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

@@ -75,7 +75,9 @@ export default {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial
           }
         },
-        { title: '紧急程度', key: 'urgency', align: 'center', headerAlign: 'center' },
+        { title: '紧急程度', key: 'urgency', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          return row.urgency ? '紧急' : '正常'
+        } },
         { title: '入库单价', key: 'stockUnitPrice', align: 'center', headerAlign: 'center' },
         { title: '入库金额', key: 'stockPrice', align: 'center', headerAlign: 'center' },
         { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },