Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue

@@ -475,12 +475,14 @@ export default {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {
-        if (!row.value) {
-          flag = flag + 1
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
         }
       }
-      // 如果检测值一项都没填则提示是否继续
-      if (flag === data.length) {
+      // 如果检测值有一项没填则提示是否继续 （在上限下限有值的情况下）
+      if (flag > 0) {
         this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue

@@ -481,12 +481,14 @@ export default {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {
-        if (!row.value) {
-          flag = flag + 1
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
         }
       }
-      // 如果检测值一项都没填则提示是否继续
-      if (flag === data.length) {
+      // 如果检测值有一项没填则提示是否继续 （在上限下限有值的情况下）
+      if (flag > 0) {
         this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

mes/qd/src/views/wms/ql/workprocedureQl/ResultPutDialog.vue

@@ -270,6 +270,39 @@ export default {
     count() {
     },
     sure() {
+      const msg = '是否继续！'
+
+      const rows = this.form.tableData
+      var flag = 0
+      for (var row of rows) {
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
+        }
+      }
+      const data = this.form
+      if (flag > 0) {
+        this.$confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          crudWorkproceduremst.sure(data).then(res => {
+            this.$emit('update:dialogShow', false)
+            this.crud.toQuery()
+            this.crud.notify('录入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          })
+        })
+      } else {
+        crudWorkproceduremst.sure(data).then(res => {
+          this.$emit('update:dialogShow', false)
+          this.crud.toQuery()
+          this.crud.notify('录入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }
+    },
+    sure2() {
       const rows = this.form.tableData
       var flag = 0
       for (var row of rows) {

mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue

@@ -65,7 +65,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="生产负责人" prop="product_person_name">
+          <el-form-item label="生产配合人" prop="product_person_name">
             <el-input v-model="form.product_person_name" style="width: 200px;"/>
           </el-form-item>
         </el-col>

mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue

@@ -74,7 +74,18 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-check"
+          size="mini"
+          @click="downdtl"
+        >
+          导出Excel
+        </el-button>
+      </crudOperation>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -105,6 +116,8 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
+import {download} from "@/api/data";
+import {downloadFile} from "@/utils";
 
 export default {
   name: 'RawUatCbQuery',
@@ -160,6 +173,17 @@ export default {
     },
     hand(value) {
       this.crud.toQuery()
+    },
+    downdtl() {
+      if (this.currentRow !== null) {
+        crud.downloadLoading = true
+        download('/api/rawUatWcQuery/download', this.crud.query).then(result => {
+          downloadFile(result, '原材料碳化钨', 'xlsx')
+          crud.downloadLoading = false
+        }).catch(() => {
+          crud.downloadLoading = false
+        })
+      }
     }
   }
 }