提交

src/store/modules/query.js

@@ -0,0 +1,13 @@
+
+const queryStore = defineStore('query', {
+  state: () => ({
+    dayworkSelectParams: null
+  }),
+  actions: {
+    setDayworkSelectParams(value) {
+      this.dayworkSelectParams = value;
+    }
+  }
+})
+
+export default queryStore

src/views/business/dayworkSelect/index.vue

@@ -121,7 +121,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="dayworkSelect">
 import {
   listDaywork,
   listDayworkItem,
@@ -139,23 +139,23 @@ import productionPlanDetailStore from "@/store/modules/productionPlanDetail";
 import { stubArray } from "lodash-es";
 
 const is_identification = ref([
-//   {
-//   value: '1',
-//   label: '废品回用'
-// }, 
-{
-  value: '2',
-  label: '工艺修改'
-}, {
-  value: '4',
-  label: '追增'
-}, {
-  value: '3',
-  label: '正常批次'
-}, {
-  value: '0',
-  label: '批废'
-}
+  //   {
+  //   value: '1',
+  //   label: '废品回用'
+  // }, 
+  {
+    value: '2',
+    label: '工艺修改'
+  }, {
+    value: '4',
+    label: '追增'
+  }, {
+    value: '3',
+    label: '正常批次'
+  }, {
+    value: '0',
+    label: '批废'
+  }
   // , {
   //   value: '5',
   //   label: '分批'
@@ -227,7 +227,7 @@ function getList() {
   loading.value = true;
   console.log(route.params)
   console.log(productionPlanDetailStore().productionPlanNo)
-  if (productionPlanDetailStore().productionPlanNo !=null  ) {
+  if (productionPlanDetailStore().productionPlanNo != null) {
     queryDayworkParams.value.productionPlanNo = productionPlanDetailStore().productionPlanNo
     productionPlanDetailStore().setProductionPlanDetailQueryParams(null)
   }

src/views/business/inventoryCheck/index.vue

@@ -8,31 +8,31 @@
                 <el-form-item class="section-title" label="盘点" />
                 <el-form-item label="创建时间：">
                     <el-date-picker v-model="queryParams.createStartTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px"  />
+                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
                     <span>~</span>
                     <el-date-picker v-model="queryParams.createEndTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px"  />
+                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
                 </el-form-item>
                 <el-form-item label="开始时间：">
                     <el-date-picker v-model="queryParams.startStartTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px"  />
+                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
                     <span>~</span>
                     <el-date-picker v-model="queryParams.startEndTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 130px" />
                 </el-form-item>
                 <el-form-item label="结束时间：">
                     <el-date-picker v-model="queryParams.endStartTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px"  />
+                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
                     <span>~</span>
                     <el-date-picker v-model="queryParams.endEndTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px"  />
+                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
                 </el-form-item>
                 <el-form-item label="状态：">
-					<el-select v-model="queryParams.status" clearable placeholder="请选择盘点状态" style="width: 145px">
-						<el-option v-for="dict in take_stock_status" :key="dict.value" :label="dict.label"
-							:value="dict.value"></el-option>
-					</el-select>
-				</el-form-item>
+                    <el-select v-model="queryParams.status" clearable placeholder="请选择盘点状态" style="width: 145px">
+                        <el-option v-for="dict in take_stock_status" :key="dict.value" :label="dict.label"
+                            :value="dict.value"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="备注：">
                     <el-input placeholder="请输入备注" v-model.trim="queryParams.remark" @keydown.enter.prevent clearable
                         style="width: 120px" />
@@ -40,8 +40,9 @@
                 <el-form-item style="margin-left: 0">
                     <el-button type="info" icon="Search" @click="handleQuery">搜索
                     </el-button>
-                    <el-button v-show=" !hasAlreadyAddTakeStock && !hasAlreadyTakeStock" v-hasPermi="['business:inventoryCheck:add']"
-                     type="primary" icon="Plus" @click="handleAdd">新增</el-button>
+                    <el-button v-show="!hasAlreadyAddTakeStock && !hasAlreadyTakeStock"
+                        v-hasPermi="['business:inventoryCheck:add']" type="primary" icon="Plus"
+                        @click="handleAdd">新增</el-button>
                 </el-form-item>
             </el-form>
             <div class="el-table-container">
@@ -52,69 +53,59 @@
                         <el-table-column label="创建时间" prop="createTime" width="200" align="center" />
                         <el-table-column label="开始时间" prop="startTime" width="200" align="center" />
                         <el-table-column label="结束时间" prop="endTime" width="200" align="center" />
-                        <el-table-column label="盘点年月" prop="stockTime" width="150" align="center" >
+                        <el-table-column label="盘点年月" prop="stockTime" width="150" align="center">
                             <template #default="scope">
-                                <el-date-picker v-if="scope.row.selectDateStatus" v-model="scope.row.stockTime" type="month" value-format="YYYY-M"
-                                  :editable="false" clearable placeholder="请选择" style="width: 130px"  />
-                                  <div v-else>{{ scope.row.stockTime }}</div>
+                                <el-date-picker v-if="scope.row.selectDateStatus" v-model="scope.row.stockTime"
+                                    type="month" value-format="YYYY-M" :editable="false" clearable placeholder="请选择"
+                                    style="width: 130px" />
+                                <div v-else>{{ scope.row.stockTime }}</div>
                             </template>
                         </el-table-column>
-                        <el-table-column label="盘点状态" prop="status" width="80" align="center" >
+                        <el-table-column label="盘点状态" prop="status" width="80" align="center">
                             <template #default="scope">
                                 <dict-tag :options="take_stock_status" :value="scope.row.status" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="备注" prop="remark"  align="center" >
+                        <el-table-column label="备注" prop="remark" align="center">
                             <template #default="scope">
-									<div v-if="scope.row.editStatus">
-										<el-input v-model.trim="scope.row.remark" size="small"
-											placeholder="请输入备注" />
-									</div>
-									<div v-else>{{ scope.row.remark }}</div>
+                                <div v-if="scope.row.editStatus">
+                                    <el-input v-model.trim="scope.row.remark" placeholder="请输入备注" />
+                                </div>
+                                <div v-else>{{ scope.row.remark }}</div>
                             </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center"  width="300">
-                                    <template #default="scope">
-                                    <el-button v-show="!scope.row.editStatus" v-hasPermi="['business:inventoryCheck:edit']"
-                                      link type="warning" icon="Edit" @click="handleUpdate(scope.row)"
-                                      >
-                                        编辑
-                                    </el-button>
-                                    <el-button v-show="!scope.row.editStatus && (scope.row.status ==1 || scope.row.status == 2)" v-hasPermi="['business:inventoryCheck:view']"
-                                     link type="primary" icon="View" @click="handleView(scope.row)"
-                                      >
-                                        查看
-                                    </el-button>
-                                    <el-button v-show="!scope.row.editStatus && scope.row.status == 0" v-hasPermi="['business:inventoryCheck:start']" 
-                                    link type="success" icon="Open" @click="handleStartTakeStock(scope.row)"
-                                       >
-                                        开始盘点
-                                    </el-button>
-                                    <el-button v-show="!scope.row.editStatus && scope.row.status ==1" link v-hasPermi="['business:inventoryCheck:end']"
-                                     type="danger" icon="TurnOff" @click="handleEndTakeStock(scope.row)"
-                                       >
-                                        结束盘点
-                                    </el-button>
-                                    <el-button
-                                    link
-                                        v-if="scope.row.editStatus"
-                                        icon="Close"
-                                        type="danger"
-                                        @click="handleCancel(scope.row, scope.$index)"
-                                        >取消</el-button
-                                        >
-                                    <el-button
-                                    link
-                                    icon="Check"
-                                    v-if="scope.row.editStatus"
-                                    type="success"
-                                    @click="handleSave(scope.row)"
-                                    >保存</el-button
-                                    >	
-                                    <el-button v-if="scope.row.status == 2" v-hasPermi="['business:inventoryCheck:downLoad']" link type="primary" icon="Download" @click="handleExport(scope.row)">导出
-                    </el-button>
-                                    </template>
-          </el-table-column>
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" width="300">
+                            <template #default="scope">
+                                <el-button v-show="!scope.row.editStatus" v-hasPermi="['business:inventoryCheck:edit']"
+                                    link type="warning" icon="Edit" @click="handleUpdate(scope.row)">
+                                    编辑
+                                </el-button>
+                                <el-button
+                                    v-show="!scope.row.editStatus && (scope.row.status == 1 || scope.row.status == 2)"
+                                    v-hasPermi="['business:inventoryCheck:view']" link type="primary" icon="View"
+                                    @click="handleView(scope.row)">
+                                    查看
+                                </el-button>
+                                <el-button v-show="!scope.row.editStatus && scope.row.status == 0"
+                                    v-hasPermi="['business:inventoryCheck:start']" link type="success" icon="Open"
+                                    @click="handleStartTakeStock(scope.row)">
+                                    开始盘点
+                                </el-button>
+                                <el-button v-show="!scope.row.editStatus && scope.row.status == 1" link
+                                    v-hasPermi="['business:inventoryCheck:end']" type="danger" icon="TurnOff"
+                                    @click="handleEndTakeStock(scope.row)">
+                                    结束盘点
+                                </el-button>
+                                <el-button link v-if="scope.row.editStatus" icon="Close" type="danger"
+                                    @click="handleCancel(scope.row, scope.$index)">取消</el-button>
+                                <el-button link icon="Check" v-if="scope.row.editStatus" type="success"
+                                    @click="handleSave(scope.row)">保存</el-button>
+                                <el-button v-if="scope.row.status == 2"
+                                    v-hasPermi="['business:inventoryCheck:downLoad']" link type="primary"
+                                    icon="Download" @click="handleExport(scope.row)">导出
+                                </el-button>
+                            </template>
+                        </el-table-column>
                     </el-table>
                 </div>
             </div>
@@ -129,7 +120,7 @@
 </template>
 
 <script setup name="inventoryCheck">
-import { listTakeStockPeriod ,addTakeStockPeriod ,updateTakeStockPeriod} from "@/api/business/takeStockPeriod";
+import { listTakeStockPeriod, addTakeStockPeriod, updateTakeStockPeriod } from "@/api/business/takeStockPeriod";
 
 import inventoryCheckForm from "./form.vue";
 import { ref } from "vue";
@@ -148,23 +139,23 @@ const loading = ref(false);
 const total = ref(0);
 
 const queryParams = ref({
-   status:null,
-   createStartTime:null,
-   createEndTime:null,
-   startTimeStr:null,
-   startTimeEnd:null,
-   endTimeStr:null,
-   endTimeEnd:null,
-   remark:null,
-   pageNum: 1,
-   pageSize: 10,
+    status: null,
+    createStartTime: null,
+    createEndTime: null,
+    startTimeStr: null,
+    startTimeEnd: null,
+    endTimeStr: null,
+    endTimeEnd: null,
+    remark: null,
+    pageNum: 1,
+    pageSize: 10,
 });
 
 /***********************  工段相关事件  ****************************/
 
 function getTakeStockPeriodList() {
     loading.value = true;
-    listTakeStockPeriod(queryParams.value).then(res =>{
+    listTakeStockPeriod(queryParams.value).then(res => {
         takeStockPeriodList.value = res.rows;
         hasAlreadyTakeStock.value = res.others.hasAddTakeStockStatus
         hasAlreadyAddTakeStock.value = res.others.hasTakeStockStatus
@@ -174,20 +165,20 @@ function getTakeStockPeriodList() {
 }
 //新增
 function handleAdd() {
-    takeStockPeriodList.value.unshift({createTime:proxy.moment().format("YYYY-MM-DD HH:mm:ss"),startTime:null,stockTime:null,endTime:null,status:"0",remark:null, editStatus: true,selectDateStatus:true })
+    takeStockPeriodList.value.unshift({ createTime: proxy.moment().format("YYYY-MM-DD HH:mm:ss"), startTime: null, stockTime: null, endTime: null, status: "0", remark: null, editStatus: true, selectDateStatus: true })
     hasAlreadyAddTakeStock.value = true
 }
 //保存按钮
 function handleSave(row) {
-    if(row.stockTime == null) {
+    if (row.stockTime == null) {
         proxy.$modal.msgError("请选择盘点时间")
         return
     }
-    row.stockYear = row.stockTime.substring(0,4)
-    row.stockMonth = row.stockTime.substring(5,7)
+    row.stockYear = row.stockTime.substring(0, 4)
+    row.stockMonth = row.stockTime.substring(5, 7)
     console.log(row)
     addTakeStockPeriod(row).then(res => {
-        if(res.code === 200) {
+        if (res.code === 200) {
             getTakeStockPeriodList()
         }
     })
@@ -205,17 +196,17 @@ function handleView(row) {
 //结束盘点
 function handleEndTakeStock(row) {
     proxy.$modal
-    .confirm("是否确认结束盘点？")
-    .then(function () {
-    row.endTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
-    row.status = 2
-    updateTakeStockPeriod(row).then(res => {
-        if(res.code === 200) {
-            proxy.$modal.msgSuccess("已成功结束盘点");
-            getTakeStockPeriodList()
-        }
-    })
-    })
+        .confirm("是否确认结束盘点？")
+        .then(function () {
+            row.endTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
+            row.status = 2
+            updateTakeStockPeriod(row).then(res => {
+                if (res.code === 200) {
+                    proxy.$modal.msgSuccess("已成功结束盘点");
+                    getTakeStockPeriodList()
+                }
+            })
+        })
 }
 //编辑按钮
 function handleUpdate(row) {
@@ -224,31 +215,31 @@ function handleUpdate(row) {
 //开始盘点
 function handleStartTakeStock(row) {
     proxy.$modal
-    .confirm("是否确认开始盘点？")
-    .then(function () {
-    row.startTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
-    row.flag = 0
-    updateTakeStockPeriod(row).then(res => {
-        if(res.code === 200) {
-            proxy.$modal.msgSuccess("已成功开始盘点");
-            getTakeStockPeriodList()
-        }
-    })
-    })
- 
+        .confirm("是否确认开始盘点？")
+        .then(function () {
+            row.startTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
+            row.flag = 0
+            updateTakeStockPeriod(row).then(res => {
+                if (res.code === 200) {
+                    proxy.$modal.msgSuccess("已成功开始盘点");
+                    getTakeStockPeriodList()
+                }
+            })
+        })
+
 }
 /** 搜索按钮操作 */
 function handleQuery() {
     getTakeStockPeriodList();
 }
-function handleCancel(row,index) {
-    if(row.id) {
-        takeStockPeriodList.value[index].editStatus = false    
+function handleCancel(row, index) {
+    if (row.id) {
+        takeStockPeriodList.value[index].editStatus = false
     }
-        getTakeStockPeriodList()
-    
-  
- 
+    getTakeStockPeriodList()
+
+
+
 }
 onMounted(() => {
     getTakeStockPeriodList();

src/views/business/outsource/DialogProducts.vue

@@ -1,106 +1,39 @@
 <template>
-  <el-dialog
-    title="添加产品"
-    v-model="visible"
-    width="800px"
-    height="400px"
-    @close="close"
-    append-to-body
-    draggable
-  >
-    <el-form
-      ref="dialogForm"
-      :model="queryParams"
-      :inline="true"
-      style="padding-top: 16px"
-    >
-      <el-form-item
-        label="关键字："
-        prop="productDescription"
-        label-width="104"
-      >
-        <el-input
-          v-model.trim="queryParams.keyword"
-          type="text"
-          @keydown.enter.prevent
-          style="width: 170px"
-          placeholder="请输入批号或产品描述"
-          :clearable="true"
-          @keyup.enter="handleSearch"
-        />
+  <el-dialog title="添加产品" v-model="visible" width="900px" height="400px" @close="close" append-to-body draggable>
+    <el-form ref="dialogForm" :model="queryParams" :inline="true" style="padding-top: 16px">
+      <el-form-item label="关键字：" prop="productDescription" label-width="104">
+        <el-input v-model.trim="queryParams.keyword" type="text" @keydown.enter.prevent style="width: 170px"
+          placeholder="请输入批号或产品描述" :clearable="true" @keyup.enter="handleSearch" />
       </el-form-item>
-      <el-form-item
-        v-if="supplierId !== '' && supplierId !== '0'"
-        label="只看外协商配置的产品："
-        prop="isSupplierProducts"
-      >
-        <el-switch
-          v-model="queryParams.isSupplierProducts"
-          active-text="是"
-          :active-value="1"
-          inactive-text="否"
-          :inactive-value="0"
-          @change="handleSearch"
-        />
+      <el-form-item v-if="supplierId !== '' && supplierId !== '0'" label="只看外协商配置的产品：" prop="isSupplierProducts">
+        <el-switch v-model="queryParams.isSupplierProducts" active-text="是" :active-value="1" inactive-text="否"
+          :inactive-value="0" @change="handleSearch" />
       </el-form-item>
       <el-form-item label-width="20px">
-        <el-button type="info" icon="Search" @click="handleSearch"
-          >搜索</el-button
-        >
+        <el-button type="info" icon="Search" @click="handleSearch">搜索</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      ref="dialogTable"
-      :data="productList"
-      size="small"
-      v-loading="loading"
-      border
-      height="370px"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table ref="dialogTable" :data="productList" size="small" v-loading="loading" border height="370px"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" />
       <el-table-column type="index" label="行号" width="50" align="center" />
-      <el-table-column
-        label="批次号"
-        align="center"
-        prop="lotCode"
-        width="96"
-      />
-      <el-table-column
-        label="料号"
-        align="center"
-        prop="productCode"
-        width="96"
-      />
-      <el-table-column
-        label="产品描述"
-        align="center"
-        prop="productDescription"
-      />
-      <el-table-column
-        label="箱号"
-        align="center"
-        prop="originalCarrier"
-        width="220"
-      />
+      <el-table-column label="批次号" align="center" prop="lotCode" width="96" />
+      <el-table-column label="料号" align="center" prop="productCode" width="96" />
+      <el-table-column label="产品描述" align="center" prop="productDescription" />
+      <el-table-column label="周转时间" align="center" prop="turnoverDate" width="150">
+        <template #default="scope">
+          {{ moment(scope.row.turnoverDate).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+      </el-table-column>
+      <el-table-column label="箱号" align="center" prop="originalCarrier" width="220" />
     </el-table>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
     <template #footer>
       <div class="dialog-footer">
-        <el-button
-          type="primary"
-          icon="Check"
-          :disabled="selections.length === 0"
-          @click="handleMultipleSelected"
-        >
+        <el-button type="primary" icon="Check" :disabled="selections.length === 0" @click="handleMultipleSelected">
           确 定
         </el-button>
         <el-button type="danger" icon="Close" @click="close">取 消</el-button>
@@ -137,7 +70,7 @@ const queryParams = ref({
   isSupplierProducts: 0,
   supplierId: "",
   productDescription: "",
-  keyword:"",
+  keyword: "",
   pageNum: 1,
   pageSize: 10,
 });