diff --git a/package.json b/package.json
index 44df32ce..c7d81fc0 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src",
"server": "SET NODE_OPTIONS=--openssl-legacy-provider && webpack-dev-server --env.server --env.develop --inline --max-old-space-size=3000",
- "dev": "vue-cli-service serve --open"
+ "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open"
},
"husky": {
"hooks": {
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index f118e522..7e0316a0 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -100,8 +100,11 @@
+
+
+
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{ formData.billNo }}
- {{ formData.shipperName }}
- {{ formData.fromCorpName }}
- {{ formData.billTime }}
-
+
+ {{ formData.billNo }}
+ {{ formData.shipperName }}
+ {{ formData.fromCorpName }}
+ {{ formData.billTime }}
+
-
+
-
-
-
-
-
- |
-
未赋码 |
-
-
-
-
- |
-
- 预赋码
- |
-
-
-
-
- |
-
- 已赋码
- |
-
+
+ {{ codingStatus }}
+
+
+
+
+
+
+ {{ scope.row.cpmctymc }}
+
+
+
{{ scope.row.count }}
-
+
- {{ scope.row.scanActCount }}
+ {{scope.row.scanCount}}/{{ scope.row.shouldCount }}
+
+
+
+
+ {{ scope.row.prepnSpec }}
+
+
+
+
+ {{ scope.row.spec }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ scope.row.ybbm }}
+
+
+
+
+ {{ scope.row.batchNo }}
+
+
-
+>
+
扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }})
@@ -233,6 +259,7 @@ export default {
countVisible: false,
scanDetailVisible: false,
bizId: null,
+ codingStatus: '已赋码',
}
},
methods: {
@@ -348,6 +375,38 @@ export default {
return rowBackground;
},
+ getCellStyle(row){
+ let cellStyle = {
+ fontSize: '32px'
+ };
+ if (row.shouldCount == 0){
+ cellStyle.fontSize = '30px'
+ cellStyle.color = '#F56C6C'
+ return cellStyle;
+ }
+ if (row.scanCount < row.shouldCount) {
+ cellStyle.color = '#F56C6C';
+ } else if (row.scanCount === row.shouldCount) {
+ cellStyle.color = '#56a717';
+ }
+ return cellStyle;
+ },
+ // cellStyle({ row, column, rowIndex, columnIndex }) {
+ // return { height: '60px' };
+ // },
+ getTagColor(row) {
+ if (row.scanActCount < row.count) {
+ this.codingStatus = '未赋码'
+ return 'danger'; // 红色
+ } else if (row.autoTagStatus == 2) {
+ this.codingStatus = '预赋码'
+ return 'warning'; // 黄色
+ } else if (row.scanActCount >= row.count) {
+ this.codingStatus = '已赋码'
+ return 'success'; // 绿色
+ }
+ }
+
},
@@ -379,4 +438,5 @@ export default {
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 1b321fc9..40e8c03d 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -22,6 +22,7 @@
{
+ // this.fromInvOptions = response.data || [];
+ // })
+ // .catch(() => {
+ // });
+ // },
+ //获取往来单位候选列表
+ findMethod(query) {
+ this.fromOptions = [];
+ let cQuery = {
+ key: query,
+ corpType: null,
+ page: 1,
+ limit: 20,
+ };
+
+ getBasicUnitMaintains(cQuery)
.then((response) => {
- this.fromInvOptions = response.data || [];
+ this.loading = false;
+ this.fromInvOptions = response.data.list || [];
})
.catch(() => {
+ this.loading = false;
});
},
getResultDetailList() {
@@ -827,7 +850,7 @@ export default {
},
created() {
this.getInvList();
- this.findFromInvList();
+ // this.findFromInvList();
this.getBusType();
this.getList();
},
diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue
index 9926d889..61ddf8bd 100644
--- a/src/views/inoutDrug/DialogCreateDrugOrder.vue
+++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue
@@ -12,7 +12,7 @@
-
上传阳采单据
@@ -361,7 +361,7 @@
-
+
-
+
下载码上放心追溯码
-
+ 导入阳采追溯码
+
+
+
+
+ {
+ if (!response.ok) {
+ throw new Error(`HTTP error! Status: ${response.status}`);
+ }
+ return response.json();
+ })
+ .then(data => {
+ if (data.code === 20000) {
+ // 更新单据号
+ if (data.data && data.data.billNo) {
+ this.orderFormData.billNo = data.data.billNo;
+ }
+
+ // 强制刷新组件
+ this.isCodeAlive = false;
+ this.isBizDetailAlive = false;
+ this.isCodeDetailAlive = false;
+
+ this.$nextTick(() => {
+ this.isCodeAlive = true;
+ this.isBizDetailAlive = true;
+ this.isCodeDetailAlive = true;
+ this.$refs.inputRef.focus();
+ this.$refs.inputRef.select();
+ this.$message.success("上传成功！");
+ });
+ } else {
+ this.$message.error(data.message);
+ }
+ })
+ .catch(error => {
+ console.error('File upload failed:', error);
+ this.$message.error('文件上传失败：' + error.message);
+ });
+ }
+
+ // 清空文件输入框的值
+ event.target.value = '';
+ },
handleFileUpload2(event) {
const file = event.target.files[0];
const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/orderFileUpload';
@@ -844,6 +920,7 @@ export default {
fetch(uploadUrl, {
method: 'POST',
headers: {
+ ADMINID: store.getters.adminId,
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
},