生产订单变更页

mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue

@@ -3,30 +3,9 @@
     <template #header>
       <span><span v-html="dialogTitle"></span>页</span>
     </template>
-    <div class="abstatus">
-      <img src="/src/assets/imgs/status/status16.png" v-if="formData.orderStatus == 16" alt="" />
-      <img src="/src/assets/imgs/status/status3.png" v-else-if="formData.orderStatus == 3" alt="" />
-      <img src="/src/assets/imgs/status/status8.png" v-else-if="formData.orderStatus == 8" alt="" />
-      <div v-else-if="formData.orderStatus == 32">
-        <div v-if="query.active != 'detailArchive'" class="shipments">
-          <div v-if="formData.deliveryStatus == 3">
-            <span class="shipmentsfont" style="margin-left:50px">已发货</span>
-          </div>
-
-          <div v-else class="shipments">
-            <span v-if="betweenDay(new Date(), new Date(formData.projectEndTime)) == -1" class="shipmentsfont">距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-            </span>
-            <span v-else-if="betweenDay(new Date(), new Date(formData.projectEndTime)) < -1" class="shipmentsfont">距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-            </span>
-            <span v-else class="shipmentsfont">距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-            </span>
-
-          </div>
-          <img src="/src/assets/imgs/status/status32.png" alt="" />
-        </div>
-        <img v-else src="/src/assets/imgs/status/status32.png" alt="" />
-      </div>
-      <img src="/src/assets/imgs/status/status64.png" v-else-if="formData.orderStatus == 64" alt="" />
+    <div class="abstatus" v-if="query.active =='detail'">
+      <img src="/src/assets/imgs/status/status3.png" v-if="formData.orderStatus == 16" alt="" />
+      <img src="/src/assets/imgs/status/statusxf.png" v-else-if="formData.orderStatus == 8" alt="" />
     </div>
     <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
       <el-card class="hl-card-info">
@@ -227,13 +206,13 @@
                   <el-table-column label="备注" min-width="180" align="center">
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.remark`" :rules="subFormRules.remark" class="mb-0px!">
-                        <el-input :disabled="detailDisabled" v-model="row.remark" placeholder="请输入备注" :class="{ 'alter-class': fieldHasAlterInRow('remark', row) }" />
+                        <el-input :disabled="detailDisabled ||row.id" v-model="row.remark" placeholder="请输入备注"  :class="{ 'alter-class': fieldHasAlterInRow('remark', row) }" />
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center" width="150">
                     <template #default="scope">
-                      <el-button v-if="'update,create'.indexOf(query.active) > -1 && !formData.hasAlter" link type="danger" size="small" @click.prevent="onDeleteItem(scope.$index)">
+                      <el-button v-if="'update,create,alter'.indexOf(query.active) > -1 && !formData.hasAlter" :disabled="detailDisabled ||scope.row.id" link type="danger" size="small" @click.prevent="onDeleteItem(scope.$index)">
                         删除
                       </el-button>
                     </template>
@@ -315,7 +294,7 @@
       <!-- 编辑页下发 -->
       <el-button v-if="query.active == 'update' && formData.orderStatus == 4 && formData.orderSource == 1" @click="submitForm('DISPATCH')" type="success" size="large">下 发</el-button>
       <!-- 订单变更页 -->
-      <el-button v-if="query.active == 'alter' && formData.orderStatus == 8 && formData.orderSource == 1" @click="submitForm('ALTER')" type="danger" size="large">变更并下发</el-button>
+      <el-button v-if="query.active == 'alter' && formData.orderStatus == 8 && formData.orderSource == 1" @click="submitForm('ALTER')" type="warning" size="large">变更并下发</el-button>
     </div>
   </el-card>
   <!-- 表单弹窗：物料列表 -->
@@ -506,8 +485,6 @@ const queryData = async (type: string, id?: number) => {
 }
 
 const submitForm = async (active) => {
-  console.log('submitForm', formData.value, active)
-
   // 校验表单
   formData.value.active = active
   await formRef.value.validate()
@@ -524,10 +501,6 @@ const submitForm = async (active) => {
     if (active != 'REPULSE') {
       formData.value.activeOpinion = ''
     }
-    // 如变更 置为已变更
-    // if (active == 'ALTER') {
-    //   formData.value.hasAlter = 1
-    // }
     const data = formData.value as unknown as ProjectOrderApi.ProjectOrderVO
 
     if ((active == 'SAVE' || active == 'DISPATCH') && active != 'ALTER') {
@@ -587,29 +560,18 @@ const submitForm = async (active) => {
 /** 新增子项按钮操作 */
 const matOpenFormRef = ref()
 const onAddItem = () => {
-  // const row = {
-  //   id: undefined,
-  //   projectOrderId: undefined,
-  //   name: undefined,
-  //   deviceModel: undefined,
-  //   amount: undefined,
-  //   compositionId: undefined,
-  //   unit: undefined,
-  //   remark: undefined,
-  //   status: 1,
-  //   alterFieldNames: []
-  // }
-  // row.projectOrderId = formData.value.id
-  // formData.value.projectOrderSubs.push(row)
   matOpenFormRef.value.open()
 }
 const getList = async (arrMat) => {
   arrMat.forEach((row) => {
     if (formData.value.projectOrderSubs.filter((item) => item.materialId == row.id).length == 0) {
-      row.materialId = row.id
-      row.projectSubName = row.name
-      row.projectSubCode = row.code
-      formData.value.projectOrderSubs.push(row)
+      const rows = {
+        materialId: row.id,
+        projectSubName: row.name,
+        projectSubCode: row.code,
+        unit: row.unit
+      }
+      formData.value.projectOrderSubs.push(rows)
     }
   })
 }