Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

src/views/inm/good_mio.vue

@@ -19,7 +19,7 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" :params="query" row-key="id" stripe>
+      <scTable ref="table" :apiObj="apiObj" :params="params" :query="query" row-key="id" stripe>
         <el-table-column type="index" width="50" />
         <el-table-column label="记录编号" prop="number"></el-table-column>
         <el-table-column label="出/入库类型">
@@ -34,7 +34,8 @@
         </el-table-column>
         <el-table-column label="出/入库日期" prop="inout_date">
         </el-table-column>
-
+        <el-table-column label="执行车间" prop="belong_dept_name">
+        </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>
         <el-table-column label="创建时间" prop="create_time">
@@ -90,8 +91,11 @@ export default {
         save: false,
       },
       query: {
+
+      },
+      params: {
         type__in: 'sale_out,do_in',
-        // item_mio__material__type: 10
+        materials__type: 10
       },
       form: {
 

src/views/inm/halfgood_mio.vue

@@ -19,7 +19,7 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="params" :query="query" stripe>
         <el-table-column type="index" width="50" />
         <el-table-column label="记录编号" prop="number"></el-table-column>
         <el-table-column label="出/入库类型">
@@ -34,7 +34,8 @@
         </el-table-column>
         <el-table-column label="出/入库日期" prop="inout_date">
         </el-table-column>
-
+        <el-table-column label="执行车间" prop="belong_dept_name">
+        </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>
         <el-table-column label="创建时间" prop="create_time">
@@ -90,8 +91,11 @@ export default {
         save: false,
       },
       query: {
+
+      },
+      params: {
         type__in: 'do_in,do_out',
-        // item_mio__material__type: 20
+        materials__type: 20
       },
       form: {
 

src/views/inm/helpso.vue

@@ -40,7 +40,7 @@ export default {
     data() {
         return {
             apiObj: this.$API.inm.warehouse.batch,
-            params: { count__gte: 1, material__type__in: '40' },
+            params: { count__gte: 1, material__type__in: '40, 50, 60, 70' },
             selection: [],
             query: {},
             warehouseOptions: []

src/views/inm/helpso_mio.vue

@@ -18,7 +18,7 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="params" :query="query" stripe>
         <el-table-column type="index" width="50" />
         <el-table-column label="记录编号" prop="number"></el-table-column>
         <el-table-column label="出/入库类型">
@@ -33,7 +33,8 @@
         </el-table-column>
         <el-table-column label="出/入库日期" prop="inout_date">
         </el-table-column>
-
+        <el-table-column label="执行车间" prop="belong_dept_name">
+        </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>
         <el-table-column label="创建时间" prop="create_time">
@@ -85,8 +86,11 @@ export default {
         save: false,
       },
       query: {
+
+      },
+      params: {
         type__in: 'pur_in',
-        // item_mio__material__type: 40
+        materials__type__in: '40, 50, 60, 70'
       },
       form: {
 

src/views/inm/mainso_mio.vue

@@ -19,7 +19,7 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="params" :query="query" stripe>
         <el-table-column type="index" width="50" />
         <el-table-column label="记录编号" prop="number"></el-table-column>
         <el-table-column label="出/入库类型">
@@ -34,7 +34,8 @@
         </el-table-column>
         <el-table-column label="出/入库日期" prop="inout_date">
         </el-table-column>
-
+        <el-table-column label="执行车间" prop="belong_dept_name">
+        </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>
         <el-table-column label="创建时间" prop="create_time">
@@ -90,8 +91,11 @@ export default {
         save: false,
       },
       query: {
+
+      },
+      params: {
         type__in: 'pur_in,do_out',
-        // item_mio__material__type: 30
+        materials__type: 30
       },
       form: {
 

src/views/inm/mioitem_form.vue

@@ -1,121 +1,61 @@
 <template>
-  <el-dialog
+  <el-dialog :title="titleMap[form.type]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    :title="titleMap[form.type]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="$emit('closed')"
-  >
     <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
       <el-form-item label="物料">
-        <el-select
+        <el-select v-model="selectMaterial" value-key="id" clearable filterable style="width: 100%"
-          v-model="selectMaterial"
+          @change="selectMaterialChange">
-          value-key="id"
+          <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name" :value="item">
-          clearable
-          filterable
-          style="width: 100%"
-          @change="selectMaterialChange"
-        >
-          <el-option
-            v-for="item in materialOptions"
-            :key="item.id"
-            :label="item.full_name"
-            :value="item"
-          >
             <span style="float: left">{{ item.full_name }}</span>
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="批次号">
         <!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
-        <el-select
+        <el-select v-model="form.batch" filterable allow-create clearable style="width: 100%"
-          v-model="form.batch"
+          :disabled="inputBatchDisable">
-          value-key="id"
+          <el-option v-for="item in wbatchOptions" :key="item.id" :value="item.batch">
-          filterable
+            <span style="float: left">{{ item.batch }}</span>
-          allow-create
+            <span style="
-          clearable
+                float: right;
-          style="width: 100%"
+                color: var(--el-text-color-secondary);
-          :disabled="inputBatchDisable"
+                font-size: 13px;
-        >
+              ">{{ item.count }}</span>
-          <el-option
-            v-for="item in wbatchOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库已有批次">
-        <el-select
+        <el-select v-model="selectBatch" value-key="id" clearable style="width: 100%" @change="selectBatchChange"
-          v-model="selectBatch"
+          @clear="selectBatchClear" :disabled="selectBatchDisable">
-          value-key="id"
+          <el-option v-for="item in batchOptions" :key="item.id" :label="item.batch" :value="item">
-          clearable
-          style="width: 100%"
-          @change="selectBatchChange"
-          @clear="selectBatchClear"
-          :disabled="selectBatchDisable"
-        >
-          <el-option
-            v-for="item in batchOptions"
-            :key="item.id"
-            :label="item.batch"
-            :value="item"
-          >
             <span style="float: left">{{ item.batch }}</span>
-            <span
+            <span style="
-              style="
                 float: right;
                 color: var(--el-text-color-secondary);
                 font-size: 13px;
-              "
+              ">{{ item.count }} -- {{ item.warehouse_name }}</span>
-              >{{ item.count }} -- {{ item.warehouse_name }}</span
-            >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库">
-        <el-select
+        <el-select v-model="form.warehouse" clearable style="width: 100%" :disabled="warehouseDisable">
-          v-model="form.warehouse"
+          <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          clearable
-          style="width: 100%"
-          :disabled="warehouseDisable"
-        >
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="数量">
         <el-input-number v-model="form.count" :min="1" style="width: 100%" />
       </el-form-item>
       <div v-if="assembShow">
-        <el-row
+        <el-row v-for="item in components" v-bind:key="item" style="margin-bottom: 8px">
-          v-for="item in components"
-          v-bind:key="item"
-          style="margin-bottom: 8px"
-        >
           <el-col :span="12"> {{ item.number }} - {{ item.name }} </el-col>
           <el-col :span="12">
             <el-select v-model="item.batch" clearable style="width: 100%">
-              <el-option
+              <el-option v-for="itemx in item.batchOptions" :key="itemx.id" :label="itemx.batch" :value="itemx.batch">
-                v-for="itemx in item.batchOptions"
-                :key="itemx.id"
-                :label="itemx.batch"
-                :value="itemx.batch"
-              >
                 <span style="float: left">{{ itemx.batch }}</span>
-                <span
+                <span style="
-                  style="
                     float: right;
                     color: var(--el-text-color-secondary);
                     font-size: 13px;
-                  "
+                  ">{{ itemx.count }}</span>
-                  >{{ itemx.count }}</span
-                >
               </el-option>
             </el-select>
           </el-col>
@@ -177,7 +117,7 @@ export default {
     };
   },
   mounted() {
-        this.getBatchs();
+    // this.getBatchs();
   },
   methods: {
     init() {
@@ -190,20 +130,14 @@ export default {
       })
     },
     //获取车间物料批次号
-        getBatchs(){
+    getWBatchs() {  // 
-            let wbatchs = []
+      if (this.belongDeptId != null && this.belongDeptId != undefined && this.belongDeptId != '') {
-            if(this.belongDeptName !=null && this.belongDeptName != undefined && this.belongDeptName != ''){
         this.$API.wpm.wmaterial.list.req({
-                    "belong_dept__name": this.belongDeptName,
+          "belong_dept": this.belongDeptId,
-                    "count__gte": 1,
+          "material": this.form.material,
           "page": 0
         }).then(res => {
-                    res.forEach(item => {
+          this.wbatchOptions = res
-                        if (!wbatchs.includes(item.batch)) {
-                            wbatchs.push(item.batch);
-                        }
-                    });
-                    this.wbatchOptions = wbatchs
         })
       }
     },
@@ -227,7 +161,7 @@ export default {
       } else if (cate == 'mainso') {
         type__in = '30'
       } else if (cate == 'helpso') {
-                type__in = '40'
+        type__in = '40, 50, 60, 70'
       }
       if (type == 'do_out') {//生产领料'10, 20, 30'
         query = { page: 0, type__in: type__in, is_hidden: false, is_assemb: false };
@@ -262,13 +196,15 @@ export default {
         var res = await this.$API.mtm.material.list.req({ page: 0, id__in: id__in })
         this.components = res
         for (var i = 0; i < this.components.length; i++) {
-                    var res2 = await this.$API.wpm.wmaterial.list.req({ page: 0, material: this.components[i].id, belong_dept: this.belongDeptId, count__gte: 1 })
+          var res2 = await this.$API.wpm.wmaterial.list.req({ page: 0, material: this.components[i].id, belong_dept: this.belongDeptId })
           this.components[i].batchOptions = res2
         }
       }
     },
     getBatchOptions() {
-            this.$API.inm.warehouse.batch.req({ page: 0, material: this.form.material, count__gte: 1 }).then(res => {
+      // 车间批次
+      this.getWBatchs();
+      this.$API.inm.warehouse.batch.req({ page: 0, material: this.form.material }).then(res => {
         this.batchOptions = res
         if (res.length == 0) {
           this.selectBatchDisable = true

src/views/mtm/materials.vue

@@ -25,12 +25,13 @@
             </el-table-column>
             <el-table-column label="型号" prop="model">
             </el-table-column>
-            <el-table-column label="物料类别" prop="type" width="200">
+            <el-table-column label="物料特征" prop="type" width="230">
               <template #default="scope">
                 <span><el-tag>{{ typeOptions[scope.row.type] }}</el-tag>
-                  <el-tag type="warning" v-if="scope.row.is_assemb">组</el-tag>
+                  <el-tag type="warning" v-if="scope.row.is_assemb" effect="plain">组</el-tag>
-                  <el-tag type="warning" v-if="scope.row.process_name">{{ scope.row.process_name }}</el-tag>
+                  <el-tag type="warning" v-if="scope.row.process_name" effect="plain">{{ scope.row.process_name
-                  <el-tag type="warning" v-if="scope.row.is_hidden">隐</el-tag></span>
+                  }}</el-tag>
+                  <el-tag type="warning" v-if="scope.row.is_hidden" effect="plain">隐</el-tag></span>
               </template>
             </el-table-column>
 
@@ -47,15 +48,17 @@
             </el-table-column>
             <el-table-column label="安全库存" prop="count_safe" width="80">
             </el-table-column>
-            <el-table-column label="操作" fixed="right" align="center" width="100">
+            <el-table-column label="操作" fixed="right" align="center" width="140">
               <template #default="scope">
-                <el-link type="primary" @click="table_edit(scope.row)" v-auth="'material.update'">
+                <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'material.update'">
                   编辑
-                </el-link>
+                </el-button>
-                <el-divider direction="vertical"></el-divider>
+                <el-button link type="warning" @click="table_copy(scope.row)" v-auth="'material.create'">
-                <el-link type="danger" @click="table_del(scope.row)" v-auth="'material.delete'">
+                  复制
+                </el-button>
+                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'material.delete'">
                   删除
-                </el-link>
+                </el-button>
               </template>
             </el-table-column>
           </scTable>
@@ -94,8 +97,8 @@ export default {
         { label: "半成品", name: 20 },
         { label: "主要原料", name: 30 },
         { label: "辅助材料", name: 40 },
-        { label: "加工工具", name: 50 },
+        // { label: "加工工具", name: 50 },
-        { label: "辅助工装", name: 60 },
+        // { label: "辅助工装", name: 60 },
         { label: "办公用品", name: 70 },
         // { label: "电/水/气", name: 0 },
       ],
@@ -105,8 +108,8 @@ export default {
         20: '半成品',
         30: '主要原料',
         40: '辅助材料',
-        50: '加工工具',
+        // 50: '加工工具',
-        60: '辅助工装',
+        // 60: '辅助工装',
         70: '办公用品',
       },
       showHidden: false,
@@ -129,6 +132,12 @@ export default {
         this.$refs.saveDialog.open("add");
       });
     },
+    table_copy(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add").setData(row);
+      });
+    },
     //编辑
     table_edit(row) {
       this.dialog.save = true;

src/views/qm/behavior.vue

@@ -5,16 +5,8 @@
                 <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'ptest.create'">新增</el-button>
             </div>
             <div class="right-panel">
-                <el-date-picker
+                <el-date-picker v-model="query.test_date" type="date" value-format="YYYY-MM-DD" />
-                    v-model="query.test_date"
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                />
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="handleQuery"
-                >查询</el-button>
             </div>
         </el-header>
         <el-main class="nopadding">
@@ -36,14 +28,7 @@
                     </el-tabs>
                 </el-header>
                 <el-main class="nopadding">
-                    <scTable
+                    <scTable ref="table" :data="tableData" :apiObj="apiObj" row-key="id" stripe :params="query">
-                        ref="table"
-                        :data="tableData"
-                        :apiObj="apiObj"
-                        row-key="id"
-                        stripe
-                        :params="query"
-                    >
                         <el-table-column type="index" width="50" />
                         <el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
                         </el-table-column>
@@ -57,7 +42,7 @@
                         </el-table-column>
                         <el-table-column label="样品密度" prop="sample_density" v-if="activeName == '高温粘度'">
                         </el-table-column>
-                        <el-table-column label="检验员" prop="test_user" show-overflow-tooltip>
+                        <el-table-column label="检验员" prop="test_user_name" show-overflow-tooltip>
                         </el-table-column>
                         <el-table-column label="实验温度及保温时间" prop="sample_number" v-if="activeName == '析晶'">
                         </el-table-column>
@@ -97,8 +82,8 @@
             </el-container>
 
         </el-main>
-        <save-dialog v-if="visible" ref="saveDialog" :activeName="activeName" :activeId="activeId"
+        <save-dialog v-if="visible" ref="saveDialog" :activeName="activeName" :activeId="activeId" @success="handleSuccess"
-            @success="handleSuccess" @closed="visible = false">
+            @closed="visible = false">
         </save-dialog>
         <!-- <el-dialog
             title="上传"

src/views/wpm/mlog_dept10.vue

@@ -458,20 +458,7 @@ export default {
             });
         },
         table_edit(row) {
-            let arr = [];
+            this.brothersList = row.mlogb;
-            let mlogb = row.mlogb;
-            this.brothersListorigin.forEach(item => {
-                let obj = {};
-                obj.count_ok = null;
-                obj.material_out = item;
-                for (let i = 0; i < mlogb.length; i++) {
-                    if (mlogb[i].material_out == item) {
-                        obj.count_ok = mlogb[i].count_ok;
-                    }
-                }
-                arr.push(obj)
-            })
-            this.brothersList = arr;
             this.dialogSave = true;
             this.$nextTick(() => {
                 this.$refs.saveDialog.open("edit").setData(row);

src/views/wpm/worktask_form.vue

@@ -218,7 +218,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="formTitle">检测统计:</div>
+      <!-- <div class="formTitle">检测统计:</div>
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="检测数">
@@ -246,7 +246,7 @@
             <el-input v-model="form.note" tyle="width:100%" placeholder="备注"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <!-- 七车间 -->
     <el-form v-if="activeType == '7车间'" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
@@ -661,16 +661,7 @@ export default {
     this.getShiftOptions();
     this.getRouteOptions();
     this.getWorkShopMaterial();
-    if (this.activeType == "10车间") {
+    this.mlogb = this.brothersList;
-      let mlogb = [];
-      this.brothersList.forEach((item) => {
-        let obj = {};
-        obj.material_out = item.material_out;
-        obj.count_ok = item.count_ok;
-        mlogb.push(obj);
-      });
-      this.mlogb = mlogb;
-    }
     if (this.activeType == "10车间") {
       this.getMaterial(0);
     } else {
@@ -906,6 +897,7 @@ export default {
             });
             this.form.mlogb = newArr;
           }
+          console.log(this.form.mlogb)
           let sun = this.form.count_ok + this.form.count_notok;
           if ((this.activeType == "7车间" || this.activeType == "10车间") && sun != this.form.count_real) {
             this.isSaveing = false;