Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/pro/packageLablePrint.js

@@ -43,10 +43,7 @@ export function packagePrintRecordInfo(data) {
   return request({
     url: "/pro/packagePrintRecord/recordPackagePrintInfo",
     method: "post",
-    data,
-    headersheaders: {
-      "Content-Type": "application/x-www-form-urlencoded",
-    },
+    data
   });
 }
 

src/utils/ruoyi.js

@@ -284,7 +284,7 @@ function printPdf(res) {
  * 接口请求加上responseType
  */
 export function postPrintPdf(name, value) {
-  request({
+  return request({
     url: "/common/print",
     method: "post",
     responseType: "blob",
@@ -303,7 +303,7 @@ export function postPrintPdf(name, value) {
  * 接口请求加上responseType
  */
 export function postBatchPrintPdf(name, values) {
-  request({
+  return request({
     url: "/common/printBatch",
     method: "post",
     responseType: "blob",

src/views/mes/pro/packageLablePrint/index.vue

@@ -275,6 +275,10 @@ export default {
   methods: {
     /** 查询工单列表 */
     getList() {
+      if (!this.queryParams.arrangeCode&&!this.queryParams.workorderCode) {
+        this.$message.error('请输入查询条件')
+        return
+      }
       this.loading = true;
       workorderList(this.queryParams).then((response) => {
         console.log(response, 'response')
@@ -343,10 +347,6 @@ export default {
         this.$message.warning('请选择打印模版')
         return
       }
-      const params = {
-        workorderId : this.produceForm.workorderId,
-        recordIds: this.selectPackageTable
-      }
       const forms = new FormData()
       forms.append('workorderId', this.produceForm.workorderId)
       this.selectPackageTable.forEach(item => {

src/views/mes/qc/qctemplate/index.vue

@@ -199,9 +199,9 @@
         <el-tab-pane label="检测项">
           <TemplateIndex ref="indexTab" :templateId="form.templateId" :optType="optType"></TemplateIndex>
         </el-tab-pane>
-        <el-tab-pane label="物料产品">
+        <!-- <el-tab-pane label="物料产品">
           <TemplateProduct ref="productTab" :templateId="form.templateId" :optType="optType"></TemplateProduct>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
 
       <div slot="footer" class="dialog-footer">

src/views/mes/qc/qctemplate/templateindex.vue

@@ -52,11 +52,11 @@
       </el-table-column>
       <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="检测方法" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
-      <el-table-column label="标准值" align="center" prop="standerVal" />
+      <!-- <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="误差上限" align="center" prop="thresholdMax" />
-      <el-table-column label="误差下限" align="center" prop="thresholdMin" />
-      <el-table-column label="操作" v-if="optType != 'view'" align="center" width="100px" class-name="small-padding fixed-width">
+      <el-table-column label="误差下限" align="center" prop="thresholdMin" /> -->
+      <el-table-column label="操作" v-if="optType != 'view'" align="center" width="150px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -111,12 +111,36 @@
         </el-row>
         <el-row v-if="form.inputType == 2">
           <el-col :span="24">
-            <el-form-item label="选择框值" prop="selectValues">
+            <!-- <el-form-item label="选择框值" prop="selectValues">
               <el-input v-model="form.selectValues" type="textarea" placeholder="请输入下拉选择框内容，格式为：[{&quot;label&quot;:&quot;显式值&quot;,&quot;value&quot;:&quot;存储值&quot;}]" />
-            </el-form-item>
+            </el-form-item> -->
+            <el-table :data="form.selectValues" style="margin-bottom:20px;">
+              <el-table-column label="参数值" align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.name" placeholder=""></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="200">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="form.selectValues.splice(scope.$index, 1)"
+                  >删除</el-button>
+                   <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-plus"
+                    v-if="scope.$index === form.selectValues.length -1"
+                    @click="form.selectValues.push({name: ''})"
+                  >新增</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
             <el-col :span="12">
                 <el-form-item label="标准值" prop="standerVal">
                     <el-input v-model="form.standerVal" placeholder="请输入标准值" />
@@ -135,8 +159,8 @@
                     </el-select>
                 </el-form-item>
             </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
             <el-col :span="12">
                 <el-form-item label="误差上限" prop="thresholdMax">
                     <el-input-number :min="0" v-model="form.thresholdMax" placeholder="请输入误差上限" />
@@ -147,7 +171,7 @@
                     <el-input-number :max="0" v-model="form.thresholdMin" placeholder="请输入误差下限" />
                 </el-form-item>
             </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
             <el-col :span="24">
                 <el-form-item label="说明图" prop="docUrl">
@@ -314,6 +338,7 @@ export default {
       const recordId = row.recordId || this.ids
       getTemplateindex(recordId).then(response => {
         this.form = response.data;
+        if (response.data.selectValues) this.form.selectValues = JSON.parse(response.data.selectValues)
         this.open = true;
         this.title = "修改检测模板-检测项";
       });
@@ -322,14 +347,16 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          const params = Object.assign({}, this.form)
+          params.selectValues = JSON.stringify(this.form.selectValues)
           if (this.form.recordId != null) {
-            updateTemplateindex(this.form).then(response => {
+            updateTemplateindex(params).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addTemplateindex(this.form).then(response => {
+            addTemplateindex(params).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -361,6 +388,11 @@ export default {
           this.form.indexType = obj.indexType;
           this.form.qcTool = obj.qcTool;
           this.form.inputType = obj.inputType;
+          if (this.form.inputType == 2) {
+            this.form.selectValues = [{name: ''}]
+          } else {
+            this.form.selectValues = null
+          }
         }
     }
   }

src/views/mes/tm/toolrequest/index.vue

@@ -137,7 +137,12 @@
       </el-table-column>
       <el-table-column label="预计结束时间" align="center" prop="endTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime,) }}</span>
+          <span>{{ parseTime(scope.row.endTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="总数量" align="center" prop="requestNum" />