Merge remote-tracking branch 'origin/master'

src/views/modules/changeManagement/changeRecord.vue

@@ -4861,7 +4861,7 @@
         if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') {
           this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
         } else {
-          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo:row.codeNo},})
+          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo: row.oriCodeNo},})
         }
       },
 

src/views/modules/demoComponents/orderProperties.vue

@@ -8,9 +8,7 @@
         <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
       </template>
       <template v-if="isAuth('103001:tab1:save')">
-        <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled"
-                   v-if="attributeDialog && orderNo">刷新属性模板
-        </el-button>
+        <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo">刷新属性模板</el-button>
       </template>
     </div>
     <div class="rq " v-if="attributeDialog">

src/views/modules/part/bomManagement.vue

@@ -4180,7 +4180,6 @@ export default {
             this.alternativeChange()
           }
         })
-      }).catch(() => {
       })
     },
 
@@ -4209,7 +4208,6 @@ export default {
             this.alternativeChange()
           }
         })
-      }).catch(() => {
       })
     },
 

src/views/modules/part/partCatalogInformation.vue

@@ -1427,8 +1427,8 @@
               conditionCodeUsageDb: '',
               multilevelTrackingDb: '',
               allowAsNotConsumedDb: '',
-              lotTrackingCode: 'Not Lot Tracking',
-              lotQuantityRule: 'One Lot Per Production Order',
+              lotTrackingCode: 'Order Based',
+              lotQuantityRule: 'Many Lots Per Production Order',
               subLotRule: 'No Sub Lots Allowed',
               componentLotRule: 'Many Lots Allowed',
               createBy: this.$store.state.user.name,

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -1016,10 +1016,10 @@
           this.searchData.oriCodeNo = '';
         }, 200)
       } else if (this.$route.params.nowCodeNo) {
-        this.searchData.codeNo = this.$route.params.nowCodeNo;
+        this.searchData.oriCodeNo = this.$route.params.nowCodeNo;
         this.search();
         setTimeout(() => {
-          this.searchData.codeNo = '';
+          this.searchData.oriCodeNo = '';
         }, 200)
       }
     },

src/views/modules/tooling/searchToolApply.vue

@@ -49,6 +49,7 @@
         </download-excel>
       </el-form-item>
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList1"
@@ -91,12 +92,11 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
-
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
@@ -106,11 +106,10 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card"
-             @tab-click="tabClick">
+
+    <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
       <el-tab-pane label="基本信息" name="attribute">
-        <order-attribute ref="dialogAttribute" :order-no="currentRow.applyNo" :code-no="'toolApply'"
-                         :function-type="'TL_Receipt'"></order-attribute>
+        <order-attribute ref="dialogAttribute" :order-no="currentRow.applyNo" :code-no="'toolApply'" :function-type="'TL_Receipt'"></order-attribute>
       </el-tab-pane>
       <el-tab-pane label="工具明细" name="detail">
         <el-table
@@ -131,8 +130,7 @@
             :label="item.columnLabel">
             <template slot-scope="scope">
               <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
           <el-table-column
@@ -158,7 +156,6 @@
           <!--            </template>-->
           <!--          </el-table-column>-->
         </el-table>
-
       </el-tab-pane>
       <el-tab-pane label="处理信息" name="tab4">
         <el-form :inline="true" label-position="top" style="margin-top: 0px">
@@ -206,15 +203,14 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="附件信息" name="down">
-        <oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site"
-                        :order-ref2="currentRow.applyNo"></oss-components>
-
+        <oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
       </el-tab-pane>
       <!-- 审批信息 -->
       <el-tab-pane label="审批信息" name="approvalInformation">
         <approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
       </el-tab-pane>
     </el-tabs>
+
     <el-dialog
       width="800px" v-drag
       :title="'刀模申请修改'"
@@ -228,8 +224,7 @@
           <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
         </el-form-item>
         <el-form-item :label="'总成本'">
-          <el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px"
-                    disabled></el-input>
+          <el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
           <el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
         </el-form-item>
         <el-form-item :label="'申请人'" required="required">
@@ -246,8 +241,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="部门" required="required">
-          <dict-data-select :site="$store.state.user.site" v-model="dataForm.department"
-                            dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
+          <dict-data-select
+            :site="$store.state.user.site"
+            v-model="dataForm.department"
+            dict-type="tool_application_department"
+            disabled style="width: 130px">
+          </dict-data-select>
         </el-form-item>
         <el-form-item required="required">
           <span slot="label" style="" @click="getBaseList(2002,1)"><a herf="#">报价员</a></span>
@@ -1678,6 +1677,9 @@ export default {
       if (this.activeName === 'approvalInformation') {
         this.getApprovalList()
       }
+      if (this.activeName == 'attribute') { // 基本信息
+
+      }
 
     },
     searchToolApplyDetail() {

src/views/modules/tooling/toolingInfo.vue

@@ -425,19 +425,18 @@ export default {
         // this.$alert('成本不能为负数或者不填', '错误', {
         //   confirmButtonText: '确定'
         // })
-
       }
       this.dataForm.applySumQty = 0
       this.dataForm.totalCost = 0
       for (const item of this.selectionDataList) {
         // 累加之前先确保值存在，并将 null 或 undefined 转换为0
-        this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0);
-        this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty*item.standardCost : 0);
+        this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0)
+        this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty * item.standardCost : 0)
       }
     },
     saveData () {
       if (this.dataForm.applySumQty === 0) {
-        this.$alert('未填写申请数量！', '错误', {
+        this.$alert('未填写申请总数！', '错误', {
           confirmButtonText: '确定'
         })
         return false;
@@ -491,8 +490,8 @@ export default {
         this.dataForm.detailList = this.selectionDataList.filter(item => item.applyQty > 0).filter(item => item.standardCost >= 0)
         saveProjectToolApply(this.dataForm).then(({data}) => {
           if (data && data.code === 0) {
-            this.visible=false;
-            this.queryDataList();
+            this.visible = false
+            this.queryDataList()
             this.$message.success('操作成功')
             // 跳转
             if (this.jumpFlag) {
@@ -500,21 +499,26 @@ export default {
                 site: this.$store.state.user.site,
                 applyNo: data.applyNo,
                 username: this.$store.state.user.name
-              };
+              }
               localStorage.setItem('ToolApplyData', JSON.stringify(inData))
               this.$router.push('tooling-searchToolApply')
             }
           } else {
-            this.$message.warning(data.msg);
+            this.$message.warning(data.msg)
           }
         })
       })
     },
+
+    // 工具申请
     applyModel () {
       if (this.selectionDataList.length === 0) {
         this.$alert('请选择项目！', '错误', {confirmButtonText: '确定'})
         return false;
       }
+      this.selectionDataList.forEach(item => {
+        item.applyQty = ''
+      })
       this.dataForm = {
         site: this.$store.state.user.site,
         applyNo: '',
@@ -533,15 +537,17 @@ export default {
         totalCost: '',
         purchaserName: '',
         detailList: [],
-      };
-      this.visible=true;
-      this.jumpFlag=true;
+      }
+      this.visible = true
+      this.jumpFlag = true
     },
   },
+
   created() {
     // 初始化Site
     this.queryParams.site = this.$store.state.user.site;
   },
+
   watch:{
     queryLoading(newVal,oldVal){
       if (newVal){