设备bug修复提交

src/views/documentManagement/certificateManagement/components/add-dialog.vue

@@ -82,7 +82,7 @@
       </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button size="small" @click="submit" type="primary">提 交</el-button>
-      <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
+      <el-button size="small" @click="close">关 闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -134,6 +134,7 @@
            this.getInfo(row.id)
         }else{
           this.title = '新增'
+          this.$refs.form.resetFields()
           this.form = {...this.defaultForm};
           this.getOrderCode()
         }
@@ -152,6 +153,11 @@
         this.$set(this.form,'imageObj',[data.fileObj])
       },
 
+      close(){
+         this.dialogVisible = false
+         // this.$refs.form.resetFields()
+      },
+
       submit(){
          this.$refs.form.validate((valid) => {
            if (!valid) {

src/views/documentManagement/certificateManagement/components/certificate-search.vue

@@ -17,6 +17,7 @@
             v-model="where.time"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
           >
           </el-date-picker>
         </el-form-item>

src/views/documentManagement/certificateManagement/index.vue

@@ -12,7 +12,7 @@
       >
         <!-- 工具栏 -->
         <template v-slot:toolbar>
-          <el-button type="primary" icon="el-icon-plus" @click="handleUpload">新建</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="handleUpload()">新建</el-button>
           <!-- <el-button type="primary" @click="handleUpload">导入</el-button> -->
         </template>
         <template v-slot:code="{ row }">

src/views/documentManagement/docManagement/components/doc-search.vue

@@ -27,6 +27,7 @@
             v-model="where.time"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
           >
           </el-date-picker>
         </el-form-item>

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

@@ -15,7 +15,7 @@
           <el-form-item
             label="厂房编码:"
             prop="code"
-            style="margin-bottom: 22px"
+            style="margin-bottom: 12px"
           >
             <el-input
               clearable
@@ -29,7 +29,7 @@
           <el-form-item
             label="厂房名称:"
             prop="name"
-            style="margin-bottom: 22px"
+            style="margin-bottom: 12px"
           >
             <el-input
               clearable
@@ -39,7 +39,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item label="状态:" prop="enabled">
             <el-select
               v-model="form.enabled"
@@ -56,7 +56,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item label="所属工厂:" prop="parentId">
             <el-select
               v-model="form.parentId"
@@ -78,7 +78,7 @@
           <el-form-item
             label="负责人部门:"
             prop="extInfo.principalDep"
-            style="margin-bottom: 22px"
+            style="margin-bottom: 12px"
           >
             <ele-tree-select
               clearable
@@ -92,7 +92,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item label="负责人:" prop="leaderId">
             <el-select
               v-model="form.leaderId"
@@ -110,7 +110,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item label="联系方式:" prop="extInfo.phone">
             <el-input
               clearable
@@ -121,7 +121,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.assetCode" label="房屋资产编码">
             <el-input
               class="form-ipt"
@@ -132,7 +132,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.campus" label="归属园院区">
             <el-input
               class="form-ipt"
@@ -143,7 +143,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.coveredArea" label="建筑面积">
             <el-input
               class="form-ipt"
@@ -154,7 +154,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.level" label="楼层">
             <el-input
               class="form-ipt"
@@ -165,7 +165,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.moneyCeiling" label="已配金额上限">
             <el-input
               class="form-ipt"
@@ -176,7 +176,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
+        <el-col :span="8" style="margin-bottom: 12px">
           <el-form-item prop="extInfo.useArea" label="使用面积">
             <el-input
               class="form-ipt"
@@ -187,7 +187,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: 22px">
+        <el-col :span="24" style="margin-bottom: 12px">
           <el-form-item label="地址:" prop="extInfo.location">
             <div class="location-warp">
               <el-cascader
@@ -206,7 +206,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: 22px">
+        <el-col :span="24" style="margin-bottom: 12px">
           <el-form-item label="备注:" prop="remark">
             <el-input
               clearable
@@ -259,7 +259,6 @@ export default {
       name: '',
       leaderId:'',
       extInfo: {
-        // principal: '', // 负责人
         principalDep: '', // 负责人部门
         phone: '', // 手机号
         locationDetail: '', // 详细地址
@@ -376,6 +375,22 @@ export default {
         if (this.form.extInfo.principalDep) {
           this.getUserPage();
         }
+      }else{
+        this.form = { ...this.defaultForm };
+        const info = {
+            principalDep: '', // 负责人部门
+            phone: '', // 手机号
+            locationDetail: '', // 详细地址
+            location: [], // 省市区
+            assetCode: '', //房屋资产编码
+            campus: '', //归属园院区
+            coveredArea: '', //建筑面积
+            level: '', //楼层
+            moneyCeiling: '', //已配金额上限
+            useArea: '' // 使用面积
+        }
+         this.$set(this.form,'extInfo',info)
+         this.$refs.form.resetFields();
       }
     },
     /* 保存编辑 */

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

@@ -20,7 +20,7 @@
              <el-form-item
                label="产线编码:"
                prop="code"
-               style="margin-bottom: 22px"
+               style="margin-bottom: 12px"
              >
                <el-input
                  clearable
@@ -34,7 +34,7 @@
              <el-form-item
                label="产线名称:"
                prop="name"
-               style="margin-bottom: 22px"
+               style="margin-bottom: 12px"
              >
                <el-input
                  clearable
@@ -44,7 +44,7 @@
                />
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="所属工厂:" prop="extInfo.factoryId">
                <el-select
                  v-model="form.extInfo.factoryId"
@@ -62,7 +62,7 @@
                </el-select>
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="所属车间:" prop="parentId">
                <el-select
                  v-model="form.parentId"
@@ -84,7 +84,7 @@
              <el-form-item
                label="负责人部门:"
                prop="extInfo.principalDep"
-               style="margin-bottom: 22px"
+               style="margin-bottom: 12px"
              >
                <ele-tree-select
                  clearable
@@ -98,7 +98,7 @@
                />
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="负责人:" prop="leaderId">
                <el-select
                  v-model="form.leaderId"
@@ -116,7 +116,7 @@
                </el-select>
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="联系方式:" prop="extInfo.phone">
                <el-input
                  clearable
@@ -127,7 +127,7 @@
                />
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="工作节拍:" prop="extInfo.workMeter">
                <el-input
                  clearable
@@ -137,7 +137,7 @@
                />
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="加工能力:" prop="extInfo.workingAbility">
                <el-input
                  clearable
@@ -147,7 +147,7 @@
                />
              </el-form-item>
            </el-col>
-           <el-col :span="8" style="margin-bottom: 22px">
+           <el-col :span="8" style="margin-bottom: 12px">
              <el-form-item label="状态:" prop="enabled">
                <el-select
                  v-model="form.enabled"
@@ -164,7 +164,7 @@
                </el-select>
              </el-form-item>
            </el-col>
-           <el-col :span="24" style="margin-bottom: 22px">
+           <el-col :span="24" style="margin-bottom: 12px">
              <el-form-item label="地址:" prop="extInfo.location">
                <div class="location-warp">
                  <el-cascader
@@ -183,7 +183,7 @@
                </div>
              </el-form-item>
            </el-col>
-           <el-col :span="24" style="margin-bottom: 22px">
+           <el-col :span="24" style="margin-bottom: 12px">
              <el-form-item label="备注:" prop="remark">
                <el-input
                  clearable
@@ -441,6 +441,19 @@ export default {
         if (this.form.extInfo.principalDep) {
           this.getUserPage();
         }
+      }else{
+        this.form = { ...this.defaultForm };
+        const info = {
+          factoryId: '',
+          principalDep: '', // 负责人部门
+          phone: '', // 手机号
+          workMeter: '', // 工作节拍
+          workingAbility: '', // 加工能力
+          locationDetail: '', // 详细地址
+          location: [] // 省市区
+        }
+         this.$set(this.form,'extInfo',info)
+         this.$refs.form.resetFields();
       }
     },
     /* 保存编辑 */

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

@@ -82,16 +82,6 @@
               @changeGroup="change_principalDep"
               placeholder="请选择负责人部门"
             />
-<!--            <ele-tree-select
-              clearable
-              :data="options_groupId"
-              v-model="form.extInfo.principalDep"
-              valueKey="id"
-              labelKey="name"
-              placeholder="请选择负责人部门"
-              @change="change_principalDep"
-              default-expand-all
-            /> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -103,19 +93,6 @@
               v-model="form.leaderId"
               :init="false"
             />
-            <!-- <el-select
-              v-model="form.leaderId"
-              placeholder="请选择负责人"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in options.leaderId"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -297,9 +274,8 @@ export default {
     // 选择负责人部门
     change_principalDep(id,info) {
       this.form.leaderId = '';
-      // this.getUserPage();
       // 根据部门获取人员
-      const params = { executeGroupId: id };
+      const params = { groupId: id };
       this.$nextTick(() => {
         this.$refs.directorRef.getList(params);
       });

src/views/ledgerAssets/equipment/components/DialogGoods.vue

@@ -15,7 +15,12 @@
         :right-style="{ overflow: 'hidden' }"
       >
         <div class="minHeight ele-border-lighter split-layout-right-content">
-          <asset-tree @handleNodeClick="handleNodeClick" ref="AssetTree" />
+          <asset-tree
+            @handleNodeClick="handleNodeClick"
+            ref="AssetTree"
+            id="4"
+            :paramsType="'type'"
+          />
         </div>
         <template v-slot:content>
           <!-- 数据表格 -->
@@ -29,6 +34,7 @@
             :datasource="datasource"
             tool-class="ele-toolbar-form"
             cache-key="systemOrgUserTable"
+            @row-click="chooseRow"
           >
             <!-- 表头工具栏 -->
             <template v-slot:toolbar>
@@ -58,6 +64,14 @@
                 </el-col>
               </el-row>
             </template>
+            <template v-slot:action="{ row }">
+              <el-radio
+                class="radio"
+                v-model="radio"
+                :label="row.id"
+                ><i></i
+              ></el-radio>
+            </template>
           </ele-pro-table>
         </template>
       </ele-split-layout>
@@ -102,7 +116,8 @@
           searchKey: '',
           categoryLevelId: ''
         },
-        current: {}
+        current: {},
+        radio:''
       };
     },
     computed: {
@@ -150,8 +165,8 @@
             showOverflowTooltip: true
           },
           {
-            columnKey: 'selection',
-            type: 'selection',
+            columnKey: 'action',
+            slot: 'action',
             align: 'center',
             fixed: 'right'
           }
@@ -194,6 +209,10 @@
         this.searchForm.categoryLevelId = info.id;
         this.reload();
       },
+      chooseRow(row){
+          this.current = row
+          this.radio = row.id
+      },
       submit () {
         if (!this.current.id) {
           return this.$message.error('请选择物品编码');

src/views/ledgerAssets/equipment/edit.vue

@@ -660,9 +660,8 @@
       },
       async cbDialogGoods (data) {
         this.basicInfo = data;
-        this.form.rootCategoryLevelId = JSON.parse(
-          this.basicInfo.categoryLevelPathId || '[]'
-        )[0];
+        console.log('data',data)
+        this.form.rootCategoryLevelId = this.basicInfo.categoryLevelPathId.split(',')[0];
         this.form.categoryId = this.basicInfo.id;
         this.form.name = this.basicInfo.name;
         // let res = await getAssetNum({
@@ -767,7 +766,8 @@
                 detailPosition: this.positionInfo.detailPosition,
                 pathIds: `${this.positionInfo.factoryCode},${this.positionInfo.workshopCode},${this.positionInfo.lineCode}`,
                 pathName: `${this.positionInfo.factoryName},${this.positionInfo.workshopName},${this.positionInfo.lineName}`,
-                type: 'PRODUCTION_LINE'
+                type: 'PRODUCTION_LINE',
+                num: 1
               },
               // 文档信息
               attUrl: this.setWd() || [],

src/views/technology/version/details.vue

@@ -46,12 +46,12 @@
              </el-col>
              <el-col :span="8">
                <el-form-item label="工艺路线名称">
-                 <span> {{infoData.categoryName}} </span>
+                 <span> {{infoData.routingName}} </span>
                </el-form-item>
              </el-col>
              <el-col :span="8">
                <el-form-item label="工艺路线版本">
-                 <span> {{infoData.routingName}} </span>
+                 <span> {{infoData.routingVersion}} </span>
                </el-form-item>
              </el-col>
              <el-col :span="8">

src/views/workforceManagement/classes/index.vue

@@ -31,7 +31,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此角色吗？"
+            title="确定要删除此班次吗？"
             @confirm="remove(row)"
           >
             <template v-slot:reference>