Merge branch 'hella_online_20240911' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240911

src/views/qms/inspectionJob/addForm.vue

@@ -120,7 +120,7 @@
                         <el-col :span="12">
                           <el-form-item label="编码">
                             <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              v-model="item.inspectionFeatureCode"
                               placeholder="根据系统生成"
                               :disabled="true"
                             />

src/views/qms/inspectionRecord/addForm.vue

@@ -119,7 +119,7 @@
                         <el-col :span="12">
                           <el-form-item label="编码">
                             <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              v-model="item.inspectionFeaturesCode"
                               placeholder="根据系统生成"
                               :disabled="true"
                             />

src/views/qms/inspectionRecord/detail.vue

@@ -39,7 +39,7 @@
             <el-col :span="12">
               <el-form-item label="编码">
                 <el-input
-                  v-model="item.inspectionRecordCharacteristicsRespVO.number"
+                  v-model="item.inspectionFeaturesCode"
                   placeholder="根据系统生成"
                   :disabled="true"
                 />

src/views/qms/inspectionRecordFirst/addForm.vue

@@ -187,7 +187,7 @@
                         <el-col :span="12">
                           <el-form-item label="编码">
                             <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              v-model="item.inspectionFeaturesCode"
                               placeholder="根据系统生成"
                               :disabled="true"
                             />

src/views/qms/inspectionRecordFirst/detail.vue

@@ -39,7 +39,7 @@
             <el-col :span="12">
               <el-form-item label="编码">
                 <el-input
-                  v-model="item.inspectionRecordCharacteristicsRespVO.number"
+                  v-model="item.inspectionFeaturesCode"
                   placeholder="根据系统生成"
                   :disabled="true"
                 />

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -288,17 +288,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({disabled:true}), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -419,17 +419,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({ disabled: true }), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({ disabled: true }), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -26,12 +26,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch key="status" v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>

src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue

@@ -26,12 +26,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -427,17 +427,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({ disabled: true }), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({ disabled: true }), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -26,12 +26,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -323,18 +323,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-        console.log(Butttondata)
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({disabled:true}), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      //   console.log(Butttondata)
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -465,17 +465,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({disabled:true}), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -26,12 +26,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="t('ts.名称').replace('ts.','')" prop="name">
-                <el-input key="name" v-model="formData.name" :placeholder="t('ts.请输入名称').replace('ts.','')" clearable />
+                <el-input key="name" v-model="formData.name" :placeholder="t('ts.请输入名称').replace('ts.','')" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="t('ts.描述').replace('ts.','')" prop="description">
-                <el-input key="description" v-model="formData.description" :placeholder="t('ts.请输入描述').replace('ts.','')" clearable />
+                <el-input key="description" v-model="formData.description" :placeholder="t('ts.请输入描述').replace('ts.','')" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -459,17 +459,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({ disabled: true }), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({ disabled: true }), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input  key="name" v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input  key="name" v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch key="status" v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1093,18 +1093,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-        console.log(Butttondata)
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({disabled:true}), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      //   console.log(Butttondata)
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -329,17 +329,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({ disabled: true }), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({ disabled: true }), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue

@@ -25,12 +25,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -418,17 +418,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
-      if (formData.value.priority == 0) {
-        Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
-          defaultButtons.formCloseBtn(null) // 关闭
-        ]
-      } else {
+      // if (formData.value.priority == 0) {
+      //   Butttondata.value = [
+      //     defaultButtons.formSaveBtn({disabled:true}), // 保存
+      //     defaultButtons.formCloseBtn(null) // 关闭
+      //   ]
+      // } else {
         Butttondata.value = [
           defaultButtons.formSaveBtn(null), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
-      }
+      // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -653,6 +653,11 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item=>{
+    item.qty = Number(item.qty).toFixed(2)
+    item.singlePrice = Number(item.singlePrice).toFixed(2)
+    item.amount = Number(item.amount).toFixed(2)
+  })
   try {
     if (formType === 'create') {
       console.log('【报废出库子列表】', data.subList)

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -1080,14 +1080,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 6
+        precision: 2,
       },
     },
     tableForm: {
       disabled: true,
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      precision: 2,
     }
   },
   {

src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue

@@ -77,7 +77,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选