工艺管理bug修复提交

src/views/equipmentManage/components/link-material-dialog.vue

@@ -329,16 +329,18 @@
       },
       async getDatasource () {
         const data = await unassociated({
-          categoryLevelGroupId: this.idMap[this.type]
+           categoryLevelGroupId: this.idMap[this.type],
+           categoryLevelRootId: this.type,
+           mainCategoryId: this.row.id
         });
         this.datasource = data.slice(0);
         this.datasourceShow = data.slice(0);
       },
       async getDatasourceRight () {
         const data = await getRelatesInformationList({
-          mainCategoryId: this.row.categoryLevelId,
-          // categoryLevelGroupId: this.idMap[this.type],
-          categoryLevelRootId: this.type
+          categoryLevelGroupId: this.idMap[this.type],
+          categoryLevelRootId: this.type,
+          mainCategoryId: this.row.id
         });
         this.datasourceRight = data.slice(0);
         this.datasourceRightShow = data.slice(0);

src/views/factoryModel/workshop/components/edit.vue

@@ -56,8 +56,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12" style="margin-bottom: 22px">
-          <el-form-item label="所属工厂:" prop="parentId">
+        <el-col :span="12">
+          <el-form-item label="所属工厂:" prop="parentId" style="margin-bottom: 22px">
             <el-select
               v-model="form.parentId"
               placeholder="请选择所属工厂"
@@ -74,7 +74,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="负责人部门:" prop="extInfo.principalDep">
+          <el-form-item label="负责人部门:" prop="extInfo.principalDep"
+            style="margin-bottom: 22px"
+          >
             <deptSelect
               v-model="form.extInfo.principalDep"
               @changeGroup="change_principalDep"
@@ -93,7 +95,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="负责人:" prop="leaderId">
+          <el-form-item label="负责人:" prop="leaderId"
+            style="margin-bottom: 22px"
+          >
             <personSelect
               ref="directorRef"
               v-model="form.leaderId"
@@ -114,8 +118,10 @@
             </el-select> -->
           </el-form-item>
         </el-col>
-        <el-col :span="12" style="margin-bottom: 22px">
-          <el-form-item label="地址:" prop="location_city">
+        <el-col :span="12">
+          <el-form-item label="地址:" prop="location_city"
+            style="margin-bottom: 22px"
+          >
             <el-input
               clearable
               :maxlength="20"
@@ -227,12 +233,6 @@ export default {
     open(type, row) {
       this.type = type;
       this.visible = true;
-      if(row.extInfo.principalDep){
-         const params = { executeGroupId: row.extInfo.principalDep };
-         this.$nextTick(() => {
-           this.$refs.directorRef.getList(params);
-         });
-      }
       if (type == 'edit') {
         for (const key of Object.keys(this.form)) {
           if (key !== 'extInfo') {
@@ -243,6 +243,12 @@ export default {
             }
           }
         }
+        if(row.extInfo.principalDep){
+           const params = { executeGroupId: row.extInfo.principalDep };
+           this.$nextTick(() => {
+             this.$refs.directorRef.getList(params);
+           });
+        }
       }
     },
     /* 保存编辑 */

src/views/material/productLinkMaterial/components/link-material-dialog.vue

@@ -309,6 +309,8 @@
       },
       cancel () {
         this.visible = false;
+        this.whereRight = {};
+        this.where = {};
       },
       async save () {
         // if (!this.datasourceRightShow.length) {

src/views/technology/parameter/components/user-edit.vue

@@ -208,9 +208,9 @@
               ? parameter.update
               : parameter.save;
 
-            const defaultValue = this.form.defaultValue
-            const maxValue = this.form.maxValue
-            const minValue = this.form.minValue
+            const defaultValue =  Number(this.form.defaultValue) 
+            const maxValue = Number(this.form.maxValue) 
+            const minValue =  Number(this.form.minValue)
             if(defaultValue!=''&maxValue!=''){
                if(defaultValue>maxValue||defaultValue==maxValue){
                   this.loading = false;

src/views/technology/production/components/user-setting.vue

@@ -257,9 +257,9 @@
         }
         let canSave = true
         for(var i=0;i<arr.length;i++){
-            const defaultValue = arr[i].defaultValue
-            const maxValue = arr[i].maxValue
-            const minValue = arr[i].minValue
+            const defaultValue = Number(arr[i].defaultValue)
+            const maxValue = Number(arr[i].maxValue)
+            const minValue = Number(arr[i].minValue)
             if(defaultValue!=''&maxValue!=''){
                if(defaultValue>maxValue||defaultValue==maxValue){
                   this.$message.warning('默认值应小于参数上限')

src/views/technology/route/components/production/components/user-setting.vue

@@ -270,9 +270,9 @@
         });
         let canSave = true
         for(var i=0;i<arr.length;i++){
-            const defaultValue = arr[i].defaultValue
-            const maxValue = arr[i].maxValue
-            const minValue = arr[i].minValue
+            const defaultValue = Number(arr[i].defaultValue)
+            const maxValue = Number(arr[i].maxValue)
+            const minValue = Number(arr[i].minValue)
             if(defaultValue!=''&maxValue!=''){
                if(defaultValue>maxValue||defaultValue==maxValue){
                   this.$message.warning('默认值应小于参数上限')