排序

src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue

@@ -19,6 +19,8 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
+<<<<<<< HEAD
+=======
           <span>采购状态:</span>
           <el-select v-model="purchaseStateValue" placeholder="采购状态" size="small">
             <el-option
@@ -27,6 +29,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           <el-button
             type="success"
             size="small"
@@ -85,11 +88,32 @@
             <template slot-scope="scope">
               <template v-if="scope.row.changeSafeValue">
                 <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
+<<<<<<< HEAD
+                <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button>
+=======
                 <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
               </template>
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
+<<<<<<< HEAD
+          <el-table-column label="设置" min-width="70" align="center">
+            <template slot-scope="scope">
+              <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
+                <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit1(scope.row)">确定</el-button>
+                <el-button
+                  v-else
+                  type="warning"
+                  size="mini"
+                  plain
+                  icon="el-icon-edit"
+                  @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+=======
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
@@ -108,7 +132,11 @@
     <el-card>
       <div slot="header">
         <span>采购明细表名称:</span>
+<<<<<<< HEAD
+        <el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
+=======
         <el-input v-model="purchasingDetailsForm" placeholder="采购明细表号" size="small" clearable/>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-button
           type="success"
           size="small"
@@ -130,6 +158,15 @@
       </div>
       <!--       -->
       <el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
+<<<<<<< HEAD
+        <el-table-column label="分配状态" align="center" min-width="170">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.是否分配)===0" type="warning" size="small">未分配</el-tag>
+            <el-tag v-if="parseInt(scope.row.是否分配)===1" type="success" size="small">已分配</el-tag>
+          </template>
+        </el-table-column>
+=======
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-table-column label="表单编号" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.表单编号 }}
@@ -152,8 +189,8 @@
           <template slot-scope="scope">
             <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
             <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
-            <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" @click="openDelete(scope.row)">删除</el-button>
+            <el-button v-else type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -169,10 +206,18 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <h3>合同详细信息</h3>
+<<<<<<< HEAD
+      <el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini">
+        <el-table-column label="序号" type="index" align="center" width="110"/>
+        <el-table-column label="表单编号" align="center" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.表单编号 }}
+=======
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
         <el-table-column label="表单编号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="物料名称" align="center" min-width="150">
@@ -192,6 +237,9 @@
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
+=======
             <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
             <b v-else>{{ scope.row.数量 }}</b>
           </template>
@@ -199,18 +247,27 @@
         <el-table-column label="单位" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.计量单位 }}
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
+=======
             <el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
             <b v-else>{{ scope.row.备注 || '—' }}</b>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+=======
             <el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
             <b v-else>移除</b>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
       </el-table>
@@ -231,7 +288,7 @@
 </template>
 
 <script>
-import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2 } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
+import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
 import { mapGetters } from 'vuex'
 export default {
   name: '', // 创建仓库采购
@@ -259,16 +316,6 @@ export default {
           value: 1
         }
       ], // 库存状态
-      purchaseStateValue: 2, // 采购状态
-      purchaseState: [
-        {
-          label: '未采购',
-          value: 1
-        }, {
-          label: '全部',
-          value: 2
-        }
-      ], // 采购状态
       tableData: [], // 表单数据
       loading: '', // 加载表单
       total: 0, // 数据总数
@@ -304,7 +351,7 @@ export default {
       this.materialModel ? check3 = 1 : check3 = 0
       this.materialName ? this.check1 = 1 : this.check1 = 0
       this.inventoryStateValue ? this.check2 = 1 : this.check2 = 0
-      searchInventoryNum(this.pageCurrent, this.pageSize, this.check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.check2, this.inventoryStateValue, this.purchaseStateValue).then(response => {
+      searchInventoryNum(this.pageCurrent, this.pageSize, this.check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.check2, this.inventoryStateValue).then(response => {
         this.tableData = response.data.rows
         this.tableData.map(v => {
           this.$set(v, 'changeSafeValue', false)
@@ -338,7 +385,26 @@ export default {
           this.dialogVisible = false
         }
       })
-    }, // 查询采购明细单
+<<<<<<< HEAD
+    },
+    cancelEdit1(row) { // 取消设置
+      row.安全库存量 = row.原安全库存量
+      row.changeSafeValue = false
+      this.$message('取消修改')
+    },
+    confirmEdit1(row) { // 确认设置
+      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
+      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
+        if (response.data[0].result === '1') {
+          row.changeSafeValue = false
+          this.$message.success('设置成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('设置失败')
+        }
+      })
+    },
+    // 查询采购明细单
     searchTable1() {
       this.tableData1 = []
       searchpurchasingDetailsForm(this.pageCurrent1, this.pageSize1, this.purchasingDetailsForm).then(response => {
@@ -352,7 +418,8 @@ export default {
               申请人: response.data.rows[i].姓名,
               检测时间: response.data.rows[i].检测时间,
               表单名称_原: response.data.rows[i].表单名称,
-              表单流水号: response.data.rows[i].id,
+              表单流水号: response.data.rows[i].表单流水号,
+              是否分配: response.data.rows[i].是否分配,
               edit: false
             })
           }
@@ -377,6 +444,15 @@ export default {
       this.searchTable1()
       row.edit = false
     },
+    updateNumber(row) {
+      updateNumber(row.id, row.数量, row.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('编辑成功')
+        } else {
+          this.$message.error('编辑失败')
+        }
+      })
+    },
     openDelete(row) {
       openDeletepurchasingDetailsForm(row.表单流水号).then(response => {
         if (response.data[0].result === '1') {
@@ -390,6 +466,10 @@ export default {
     addMateriel() {
       addmateriel(this.formNumber, this.materielGroup).then(response => {
         if (response.data[0].result === '1') {
+          searchtable2(this.formNumber).then(response => {
+            console.log(response.data)
+            this.tableData2 = response.data
+          })
           this.$message.success('选入物料信息成功')
         } else {
           this.$message.error('选入物料信息失败')
@@ -397,10 +477,11 @@ export default {
       })
     }, // 查询表单明细
     searchTable2(row) {
-      this.formNumber = row.表单编号
+      this.formNumber = row.表单流水号
       this.tableData2 = []
-      searchtable2(row.表单编号).then(response => {
-        this.tableData2 = response.data.rows
+      searchtable2(row.表单流水号).then(response => {
+        console.log(response.data)
+        this.tableData2 = response.data
       })
     }, // 勾选物料
     handleSelectionChange(val) {